From: drh <>
Date: Sat, 25 Mar 2023 01:50:07 +0000 (+0000)
Subject: Fix CLI non-handling of OOM.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c2ff90e6b361097ae55b83777710f478fe25b5b;p=thirdparty%2Fsqlite.git

Fix CLI non-handling of OOM.

FossilOrigin-Name: 44c76f001af0d4e48b3e3a8d6a5bc1dedec5afee82d4d3a37562a330a79cc052
---

diff --git a/manifest b/manifest
index e7c8545506..c6bd692402 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sundocumented,\svestigial\sSQL\sfunctions\sin\sthe\sCLI\sthat\swere\sonce\sused\nfor\sthe\s".recover"\scommand\sbut\sare\snow\sno\slonger\sneeded.\s\sThis\sis\sa\sfix\sfor\nthe\sproblem\sdescribed\sby\s[forum:/forumpost/be9c294ee0|forum\spost\sbe9c294ee0].
-D 2023-03-24T22:24:08.704
+C Fix\sCLI\snon-handling\sof\sOOM.
+D 2023-03-25T01:50:07.026
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -622,7 +622,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 6a0253379cc15b3f80321362a61f487a8ef7cd2487fe62e1eb2317b3f871c61f
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 1a65f39894ccf9404882e6ed9cea909da55508ac167108ba8bf054ec60f60a80
-F src/shell.c.in c29a0f35c0284a88c8a3454a6d6858bdd5648bd8eac15ce07cdfeb87a1e7b7bd
+F src/shell.c.in a608a209c3f61f9debce155b5c7d56c9a785d52eb62b6831be449e2a5b976221
 F src/sqlite.h.in 662a2fa083d093896b92560c871dea6d86792b49dc4bf7b4e8dbeca8e7171488
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2045,9 +2045,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b95e69330eca0f4561a5a448c43643a83329db1daa48b568b69d0fdb55bbc9ec
-Q +1ef461aa4e95d254c2c1edebbbfd92ca96d752e04f68ebe70104e8d936d36be9
-R 0d3e47953764bbc62c87767b78cf5168
+P 74d14900afd10d0284981f648047e781c7a468bc6b292aa3bb6678fbd19fbd4d
+Q +6f6a0fd63b13cb827d6a402de01a701eb5b3f92954032ea80e78ec864861a26c
+R dbdfa4ae68669b3e7000e12b952e73a3
 U drh
-Z ebae86ce5d5cf739597940d3f94ccaf8
+Z 20b3c6fae12ce7f143e01e38c4dd6624
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1e48d20d2e..3b90747ffc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-74d14900afd10d0284981f648047e781c7a468bc6b292aa3bb6678fbd19fbd4d
\ No newline at end of file
+44c76f001af0d4e48b3e3a8d6a5bc1dedec5afee82d4d3a37562a330a79cc052
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 4cec2b9d7d..e4a6a6b3ab 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -2088,6 +2088,7 @@ static void printSchemaLine(FILE *out, const char *z, const char *zTail){
     int i;
     for(i=0; i<ArraySize(azTerm); i++){
       char *zNew = sqlite3_mprintf("%s%s;", zOrig, azTerm[i]);
+      shell_check_oom(zNew);
       if( sqlite3_complete(zNew) ){
         size_t n = strlen(zNew);
         zNew[n-1] = 0;