Fix some OOM handling problems on this branch.

FossilOrigin-Name: 2085c7f12a3916ec883c31795e29f2e2b6641c30ecf748cce9bff7b13b061d1f

diff --git a/manifest b/manifest
index 80413c4c4e6ba1499536c68b902cf0ba5f7e9d74..a91c89a359aa46edb1c48eee7567cc932005640c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\strunk\sinto\sthis\sbranch.
-D 2024-03-13T15:47:52.750
+C Fix\ssome\sOOM\shandling\sproblems\son\sthis\sbranch.
+D 2024-03-13T17:33:45.566
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -709,7 +709,7 @@ F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c 88f3c98b0ebbee295bb5085753bdb64ef1546ee5f0f0100b8be4f756b8a1acc6
+F src/insert.c 7d4e27871c23ad98d062dcf21509573229b41307e125d4569a89e4a489383134
 F src/json.c e2e40760d6689134c3e2ece38c6a496b34ff5e2661a8f238444a119af666fdce
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
@@ -2179,8 +2179,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 94791824a6f04782aac6bc16c182685e2d6ebf5c688dc9f8d59e479c6fd5a40e 924281b94d8e6ba674d6fe2f7f01da890351355a854e9e6fe623fad1180f7392
-R af81f2952048774d882db6d201804b0c
+P 38635651f08d42110c01d6b24f6e362e340511846294f8696af4afc795dae80d
+R 3557bbe553b856781f68b1001ce502f1
 U dan
-Z a427b7a910e44c4f56ce4ce6ef8524f2
+Z cbe8c4c577b21b3ca1560ccfb96c64e5
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 4f0c6af8d44cef9808e4991e9dc2541ee3530dfc..f60296676d9f8b798f2162abc9aa6ed3090e4739 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38635651f08d42110c01d6b24f6e362e340511846294f8696af4afc795dae80d
\ No newline at end of file
+2085c7f12a3916ec883c31795e29f2e2b6641c30ecf748cce9bff7b13b061d1f
\ No newline at end of file

diff --git a/src/insert.c b/src/insert.c
index 7303e1950a20ff03d2c9c9fb3e622fd790eb02cd..627a4892ecdbee28e64d52a380e95dd836a7978d 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -578,7 +578,7 @@ void sqlite3AutoincrementEnd(Parse *pParse){
 #endif /* SQLITE_OMIT_AUTOINCREMENT */
 
 void sqlite3MultiValuesEnd(Parse *pParse, Select *pVal){
-  if( pVal->pSrc->nSrc>0 ){
+  if( pVal && pVal->pSrc->nSrc>0 ){
     SrcItem *pItem = &pVal->pSrc->a[0];
     sqlite3VdbeEndCoroutine(pParse->pVdbe, pItem->regReturn);
     sqlite3VdbeJumpHere(pParse->pVdbe, pItem->addrFillSub - 1);
@@ -640,25 +640,24 @@ Select *sqlite3MultiValues(Parse *pParse, Select *pLeft, ExprList *pRow){
       Vdbe *v = sqlite3GetVdbe(pParse);
       Select *pRet;
   
-      if( v==0 ) return pLeft;
       pRet = sqlite3SelectNew(pParse, 0, 0, 0, 0, 0, 0, 0, 0);
-      if( pRet==0 ) return pLeft;
-      p = &pRet->pSrc->a[0];
-      pRet->pSrc->nSrc = 1;
-  
-      p->pSelect = pLeft;
-      p->fg.viaCoroutine = 1;
-      p->addrFillSub = sqlite3VdbeCurrentAddr(v) + 1;
-      p->regReturn = ++pParse->nMem;
-      p->iCursor = -1;
-  
-      sqlite3VdbeAddOp3(v,OP_InitCoroutine,p->regReturn,0,p->addrFillSub);
-      sqlite3SelectDestInit(&dest, SRT_Coroutine, p->regReturn);
-      sqlite3Select(pParse, pLeft, &dest);
-      p->regResult = dest.iSdst;
-      assert( pParse->nErr || dest.iSdst>0 );
-  
-      pLeft = pRet;
+      if( pRet ){
+        p = &pRet->pSrc->a[0];
+        pRet->pSrc->nSrc = 1;
+
+        p->pSelect = pLeft;
+        p->fg.viaCoroutine = 1;
+        p->addrFillSub = sqlite3VdbeCurrentAddr(v) + 1;
+        p->regReturn = ++pParse->nMem;
+        p->iCursor = -1;
+
+        sqlite3VdbeAddOp3(v,OP_InitCoroutine,p->regReturn,0,p->addrFillSub);
+        sqlite3SelectDestInit(&dest, SRT_Coroutine, p->regReturn);
+        sqlite3Select(pParse, pLeft, &dest);
+        p->regResult = dest.iSdst;
+        assert( pParse->nErr || dest.iSdst>0 );
+        pLeft = pRet;
+      }
     }else{
       p = &pLeft->pSrc->a[0];
     }
@@ -686,6 +685,8 @@ Select *sqlite3MultiValues(Parse *pParse, Select *pLeft, ExprList *pRow){
         }
         sqlite3SelectDelete(pParse->db, pSelect);
       }
+    }else{
+      sqlite3ExprListDelete(pParse->db, pRow);
     }
   }