Convert an assert() in R-Tree into a database corruption detection case.

timerz98 · Jul 29, 2019 · 496878e · 496878e
1 parent 285665d
commit 496878e
Show file tree

Hide file tree

Showing 2 changed files with 273 additions and 1 deletion.
diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
@@ -669,14 +669,16 @@ static int nodeAcquire(
   ** increase its reference count and return it.
   */
   if( (pNode = nodeHashLookup(pRtree, iNode))!=0 ){
-    assert( !pParent || !pNode->pParent || pNode->pParent==pParent );
     if( pParent && !pNode->pParent ){
       if( nodeInParentChain(pNode, pParent) ){
         RTREE_IS_CORRUPT(pRtree);
         return SQLITE_CORRUPT_VTAB;
       }
       pParent->nRef++;
       pNode->pParent = pParent;
+    }else if( pParent && pNode->pParent && pParent!=pNode->pParent ){
+      RTREE_IS_CORRUPT(pRtree);
+      return SQLITE_CORRUPT_VTAB;
     }
     pNode->nRef++;
     *ppNode = pNode;