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

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

FossilOrigin-Name: 8290646792bc5411112b0c01dc5ac0837743056a7679725ee2edefef2e10d146
---

diff --git a/manifest b/manifest
index 7fb6fd304c..b875311c58 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:47:48.118
+C Reformulate\s[34439fe3aeea7cbb]\sslightly\sto\sresolve\sa\sfalse-positive\sOOM\sreported\sin\s[forum:2eadfe94e3|forum\spost\s2eadfe94e3].
+D 2024-03-05T17:33:04.627
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -751,7 +751,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d77c6160bc8f249c2196fdd3e75f66a1dd70e37aa25c39aedc7b1f93c42b7c6d
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 43fabfc01bf87addd15e39f112f1e2ade15b19594835ab8a9e5bd50839d4e1b1
-F src/shell.c.in 6e7cd81874e3cea68b4f2dc72a8731a5f545aca0b3e48f132e3c6ee6862e3c0a
+F src/shell.c.in 78bbd861cd0128aed67c0136561572ebcf11649be6cea86bee8491576d5958d0
 F src/sqlite.h.in 19a2db3995a699bd7f6dfb423856242bfceb7ec849a93c91d241d19fc28d9f0f
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2176,8 +2176,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 b4ce270b3f19499385d0923f0f28f702c8f664476def3994fdba5d418e3c5edb
-R c608a41202eeb1dd993e7f11e029f933
-U drh
-Z 7dedc29c56fa74e9a5dfd76b2357e847
+P 952ed71b9b61e79fe807ac3134bdfa7c94a415e02f13f94440a34d6d548d171e
+R 7a7e70231da662a6d891be7e73e90380
+U stephan
+Z b9dbf98318196caf6d04789a6da016ae
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 14670d7436..59d20d5266 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-952ed71b9b61e79fe807ac3134bdfa7c94a415e02f13f94440a34d6d548d171e
\ No newline at end of file
+8290646792bc5411112b0c01dc5ac0837743056a7679725ee2edefef2e10d146
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 36bbb93ec1..1d7f8df450 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3776,6 +3776,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*) );
@@ -3861,7 +3862,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 = "  ";