From: stephan <stephan@noemail.net>
Date: Tue, 5 Mar 2024 17:39:56 +0000 (+0000)
Subject: Reformulate [34439fe3aeea7cbb] slightly to resolve a false-positive OOM reported... 
X-Git-Tag: version-3.45.2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91b54ccc8f437b605bd21c6e82656efdf482eb64;p=thirdparty%2Fsqlite.git

Reformulate [34439fe3aeea7cbb] slightly to resolve a false-positive OOM reported in [forum:2eadfe94e3|forum post 2eadfe94e3].

FossilOrigin-Name: 320ccb5d5f5c3b25b319426b62c8a86fc3209a04480f5ca7f6f40cb16f04c795
---

diff --git a/manifest b/manifest
index 77f1347559..99feacc07b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\svalue\sreturned\sby\sthe\sjson_each.json\sfield\sneeds\sto\ssurvive\slonger\sthan\nthe\sjson_each\svirtual\stable\sitself,\sin\sthe\sevent\sthat\sthe\svalue\sis\sused\sin\nan\saggregate\sexpression.\s\sdbsqlfuzz\s5120bd0b3bb0b73eebbcb79ac37c6b0663fccad6
-D 2024-03-05T16:59:00.586
+C Reformulate\s[34439fe3aeea7cbb]\sslightly\sto\sresolve\sa\sfalse-positive\sOOM\sreported\sin\s[forum:2eadfe94e3|forum\spost\s2eadfe94e3].
+D 2024-03-05T17:39:56.516
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -739,7 +739,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d873365b47b39e5e857f86bd8cc3effe7eb2d34f26e6fb07b4d01b0dca9c9481
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c f1a81ff4f8e9e76c224e2ab3a4baa799add0db22158c7fcede65d8cc4a6fa2da
-F src/shell.c.in d1ed426aae2d547932971e8019939cacb4dfda8258e45b8924b250e488e2d53d
+F src/shell.c.in c7e7e4812515403e5236c199859d9d87e8d4d25a65516eaede9f522726d16ce0
 F src/sqlite.h.in 020d7b7307dda51420dc48b47e5334eaface77baba6bd9818375d392eb3ab5b5
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2160,9 +2160,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 1ebea57ff212aaac83f388cdebd13f319a7c57b0cdc7467b26d3f49cb7e39666
-Q +952ed71b9b61e79fe807ac3134bdfa7c94a415e02f13f94440a34d6d548d171e
-R 7dad42a1b322700630bc4a0dbb248829
-U drh
-Z 9c87ed90f2ae1a6bc89bc77a4cfceb52
+P 040946b342fd532692025806c124643842fdfda55e0c492cd058dcb7f054cc79
+Q +8290646792bc5411112b0c01dc5ac0837743056a7679725ee2edefef2e10d146
+R 8ab7429ab46e445b25c29aa19d0fc5fe
+U stephan
+Z c323c5409b85b1baedb97fc185b59f5e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cfc531b169..19f6afe886 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-040946b342fd532692025806c124643842fdfda55e0c492cd058dcb7f054cc79
\ No newline at end of file
+320ccb5d5f5c3b25b319426b62c8a86fc3209a04480f5ca7f6f40cb16f04c795
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index da3b9f8706..861e60997c 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3764,6 +3764,7 @@ static void exec_prepared_stmt_columnar(
   rc = sqlite3_step(pStmt);
   if( rc!=SQLITE_ROW ) return;
   nColumn = sqlite3_column_count(pStmt);
+  if( nColumn==0 ) goto columnar_end;
   nAlloc = nColumn*4;
   if( nAlloc<=0 ) nAlloc = 1;
   azData = sqlite3_malloc64( nAlloc*sizeof(char*) );
@@ -3849,7 +3850,6 @@ static void exec_prepared_stmt_columnar(
     if( n>p->actualWidth[j] ) p->actualWidth[j] = n;
   }
   if( seenInterrupt ) goto columnar_end;
-  if( nColumn==0 ) goto columnar_end;
   switch( p->cMode ){
     case MODE_Column: {
       colSep = "  ";