From: drh <>
Date: Sat, 30 Jan 2021 03:06:19 +0000 (+0000)
Subject: Fix handling of an OOM condition in sqlite3AddReturning().
X-Git-Tag: version-3.35.0~118^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf4108bbc687170edaeaed2548524bec3b63b5eb;p=thirdparty%2Fsqlite.git

Fix handling of an OOM condition in sqlite3AddReturning().

FossilOrigin-Name: 52204cd768f115d13249ff0e3a252b716620f7ad16a6962e1192a09137a78596
---

diff --git a/manifest b/manifest
index 1654f29a1a..5b308e9abc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\smemory\sdeallocation\sproblem\sthat\scomes\sup\swhen\sdoing\sa\sRETURNING\squery\non\sa\scorrupt\sdatabase.\s\sI\sthink\sI\sfixed\sthis\sbefore,\sbut\sit\sgot\sunfixed\swith\nstale\seditor\scontent.
-D 2021-01-30T02:43:26.023
+C Fix\shandling\sof\san\sOOM\scondition\sin\ssqlite3AddReturning().
+D 2021-01-30T03:06:19.421
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 F src/btree.c 47d9fe97d5c0d74506154e3597f8a23b81a00080751dc4d11fec91ee22796f4c
 F src/btree.h 285f8377aa1353185a32bf455faafa9ff9a0d40d074d60509534d14990c7829e
 F src/btreeInt.h 7614cae30f95b6aed0c7cac7718276a55cfe2c77058cbfd8bef5b75329757331
-F src/build.c 451f832bfcbcb3004b09909608c452f1488863111167378355f95782c95bb358
+F src/build.c d708731a10a780723f7f6d996c1a7ff827ce2153bb4b6e964a59176fc373a6a3
 F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 2a322b9a3d75771fb4d99e0702851f4f68dda982507a0f798eefb0712969a410
@@ -1899,7 +1899,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1b8ed52275a54800df90682d694b482f55f26c6c4a420659f9a3b7bfc61e8abe
-R cf21e41910dc0faee5037ce4e11838eb
+P 02b1415efb7d9849499afe4e9dbf7e470484bf144d6ca3d28fdc38fc0ac10afa
+R 0f2932eca63747c13c7de64fbcf0f21a
 U drh
-Z 8a2777d3702d0168b2e6293ee5f1e515
+Z 484e428235115814320582a3c935b7db
diff --git a/manifest.uuid b/manifest.uuid
index 828d783ff4..6b582d77da 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-02b1415efb7d9849499afe4e9dbf7e470484bf144d6ca3d28fdc38fc0ac10afa
\ No newline at end of file
+52204cd768f115d13249ff0e3a252b716620f7ad16a6962e1192a09137a78596
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 4143221c39..e9e35333c4 100644
--- a/src/build.c
+++ b/src/build.c
@@ -1277,6 +1277,7 @@ void sqlite3AddReturning(Parse *pParse, ExprList *pList){
   pRet->pReturnEL = pList;
   sqlite3ParserAddCleanup(pParse,
      (void(*)(sqlite3*,void*))sqlite3DeleteReturning, pRet);
+  if( db->mallocFailed ) return;
   pRet->retTrig.zName = "sqlite_returning";
   pRet->retTrig.op = TK_RETURNING;
   pRet->retTrig.tr_tm = TRIGGER_AFTER;