From: drh <>
Date: Tue, 25 Jan 2022 00:03:25 +0000 (+0000)
Subject: Minor adjustment to error handling in sqlite3FinishCoding().
X-Git-Tag: version-3.38.0~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5c9a707578add09ac07fef85799a2378ee4a89a;p=thirdparty%2Fsqlite.git

Minor adjustment to error handling in sqlite3FinishCoding().

FossilOrigin-Name: a8db69411b0d1275909adeb21027784ada17af24efe3a59ae0ae2a897659ff17
---

diff --git a/manifest b/manifest
index 8d13f4f3e6..f8d24f4d54 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunnecessary\sassert()\sthat\sis\ssometimes\snot\strue\sfollowing\san\sOOM.
-D 2022-01-24T21:47:00.416
+C Minor\sadjustment\sto\serror\shandling\sin\ssqlite3FinishCoding().
+D 2022-01-25T00:03:25.602
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -495,7 +495,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 F src/btree.c ddab31c38d5f16114bc68392430556b1063fe14e0020f9a56d2c35ddd58ba7e3
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h ee9348c4cb9077243b049edc93a82c1f32ca48baeabf2140d41362b9f9139ff7
-F src/build.c 6037f01800741633853e4b1f8079bf0172a9f583bfde2d680d5874629c09e926
+F src/build.c 9329120c4522d1ad881b9e62108870c8a5e994e31f4d813d0eb3de323d25e362
 F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 2cce39df1a13e05b7633e6d21b651f21492471f991dd7b323a4ee4e7b7f0b7f1
@@ -1941,8 +1941,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 d1fbf63330830c4b9549d0e67f6cdc19fe7a9dc3fcf509795fd1175499fddc82
-R cdee37d1ef86d53b092ac478f4ac2ad6
+P e9361d72f362b390a31f667363b01cf9d4b78aa19ed5c97f21afe9da764b89c0
+R 2f204671367b290a50dcca5128a83ae4
 U drh
-Z fb8b5f1d8af8dfa985fd290959ee5924
+Z 303c6274f1d08ea5df8933a6d290bc89
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b6312d78f8..b1380388fa 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e9361d72f362b390a31f667363b01cf9d4b78aa19ed5c97f21afe9da764b89c0
\ No newline at end of file
+a8db69411b0d1275909adeb21027784ada17af24efe3a59ae0ae2a897659ff17
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index b9d47bb266..cfff85cf9e 100644
--- a/src/build.c
+++ b/src/build.c
@@ -146,7 +146,7 @@ void sqlite3FinishCoding(Parse *pParse){
   assert( db->pParse==pParse );
   if( pParse->nested ) return;
   if( pParse->nErr ){
-    if( NEVER(pParse->rc==SQLITE_OK) ) pParse->rc = SQLITE_ERROR;
+    if( db->mallocFailed ) pParse->rc = SQLITE_NOMEM;
     return;
   }
   assert( db->mallocFailed==0 );