Fix CLI mishandling of OOM during .import _of_ a DB. [forum:7ed4a250d3|Reported by...

FossilOrigin-Name: 30da3f0ebd944754881bce678c61289fdaf1e32198d241cc6b5c003e4fb33c0e

diff --git a/manifest b/manifest
index c99e7ab4be3211f9fc5f48f2b0fc283236db0c90..37837d383e67fc2fa8a02be263f93c0f4b78603b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sCLI,\sensure\sthat\sthe\sargument\sto\squoteChar()\sis\snot\sa\sNULL\spointer\ndue\sto\sa\sprior\sOOM.
-D 2023-05-03T01:25:37.476
+C Fix\sCLI\smishandling\sof\sOOM\sduring\s.import\s_of_\sa\sDB.\s[forum:7ed4a250d3|Reported\sby\sforum\spost\s7ed4a250d3].
+D 2023-05-03T02:32:42.390
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -636,7 +636,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c f879cef11c462a2c37a8c906932781e384c3bb32042c355a704a043029c90d27
-F src/shell.c.in e239f39df481a360dfedc6588c2c8666565096333b9e7a92474038679ca2bd7e
+F src/shell.c.in 589e647fe907fbf70b0e503b601f2ee1fc0587c9bec0c38a589824d2b19f9af3
 F src/sqlite.h.in d6b0b83b2deab8f92ef7cc6f6fb94fa59d21c59f7b55f4c693bfff161ce42238
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2068,8 +2068,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 92ade220dcf5c1b76a5db605b1467a01051271957cd26f790755904fd82772eb
-R a217a0d6fd378e2e6a946b83e8d0fa36
-U drh
-Z 51a1ea33dcd8dc62a0ce952364b1451a
+P 776d1a47aae3c3679a2d158595e84facf118adf2d1bca0f0642311dd346479b8
+R 19f615e80f231fc52648e343cfe97c62
+U larrybr
+Z c218f3b36abf312eb659cc1f0b002462
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index c1cfea91e4f4edee14b28341609085786bdb5431..c97ba7733f0b128566293bd7d93153eb19096b26 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-776d1a47aae3c3679a2d158595e84facf118adf2d1bca0f0642311dd346479b8
\ No newline at end of file
+30da3f0ebd944754881bce678c61289fdaf1e32198d241cc6b5c003e4fb33c0e
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index cb033edeb943a04eb1c4ab51b5986c10a4c02a55..46675f7780c42a75c89f4001ea62679efbea321b 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -7875,7 +7875,7 @@ FROM (\
       sqlite3_bind_int(pStmt, 1, nDigits);
       rc = sqlite3_step(pStmt);
       sqlite3_finalize(pStmt);
-      assert(rc==SQLITE_DONE);
+      if( rc!=SQLITE_DONE ) rc_err_oom_die(SQLITE_NOMEM);
     }
     assert(db_int(*pDb, zHasDupes)==0); /* Consider: remove this */
     rc = sqlite3_prepare_v2(*pDb, zCollectVar, -1, &pStmt, 0);