CLI to handle absurd string length limit better. [forum:5180af725f1cc375|forum post...

FossilOrigin-Name: 1489e7f53a4863b316af6dee10d9c66491d1bed6cf52a3538ac118c03b1d7ef9

diff --git a/manifest b/manifest
index d6cd4f55c8be07da5d83159cc02395f632e4a61e..e2a4842d8cdd13afab951bab307390ec1d12d02c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sneed\sfor\scast\sin\sCLI\sshell_check_oom()\scalls.
-D 2023-04-22T09:26:36.892
+C CLI\sto\shandle\sabsurd\sstring\slength\slimit\sbetter.\s[forum:5180af725f1cc375|forum\spost\s5180af725f1cc375]
+D 2023-04-22T11:24:52.124
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -633,7 +633,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 ac2fd1e1c0c0c5b1b3fcb3eaf0979599f8741a7ba3dfd9746b0c58fd67aa4091
+F src/shell.c.in b39dd30addf6ac8d56087ea920aa303e257b0fb8a3f800110a4d5b4be1a8d12f
 F src/sqlite.h.in 4fff9c6cc5d4cbba9532a668112efb6dc469c425e1a2196664d7c07d508363ef
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2059,8 +2059,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 81a74ee9d66ba23dfadd875e372ce96491dd6bf146e03e7fec8c3fd98e6be825
-R 888832a9c27abfed9d01271116b52d4d
+P c88550ef6711b03a81e2e6d121e2eb99ccff6e925c025dd6e85dd81088508400
+R c1d466045065a44b94ee36b4a1ca6613
 U larrybr
-Z 2e700a9c3ffdbd06ea1f995ee54b1148
+Z f005e7b2e85ae20e6a18880efb30cee5
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 43336de39498ceade19f09d8e4f2b611670b91d3..7b1e17a7e89579fb1803372ee8bdd5addd1bffed 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c88550ef6711b03a81e2e6d121e2eb99ccff6e925c025dd6e85dd81088508400
\ No newline at end of file
+1489e7f53a4863b316af6dee10d9c66491d1bed6cf52a3538ac118c03b1d7ef9
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 49cdc984506f1938d46d135b5b35444f47c618b1..f9669dc9c3ea799db901b646cd2e1320fa8d9d85 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3840,6 +3840,7 @@ static void exec_prepared_stmt_columnar(
     }
     if( wx<0 ) wx = -wx;
     uz = (const unsigned char*)sqlite3_column_name(pStmt,i);
+    if( uz==0 ) uz = "";
     azData[i] = translateForDisplayAndDup(uz, &zNotUsed, wx, bw);
   }
   do{