From: drh <>
Date: Fri, 28 Apr 2023 00:19:55 +0000 (+0000)
Subject: In the CLI, early out from the output_quoted_string() routine if the
X-Git-Tag: version-3.42.0~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe03773305fa7c52e26df3a5794475037fbf456a;p=thirdparty%2Fsqlite.git

In the CLI, early out from the output_quoted_string() routine if the
input string is NULL.  [forum:/forumpost/8a22c0bfa7|forum post 8a22c0bfa7].

FossilOrigin-Name: 2881978d7b7014738a21c590b0430c4fa40e6b00b9547d0284b7656124523ae9
---

diff --git a/manifest b/manifest
index cbe41d4e9d..8dfeca3498 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sa\snew\stechnique\sto\sdetect\sfresh\sOOM\sfaults\sin\scolumnName()\sthat\sdoes\snot\nrely\son\sthere\sbeing\sno\sOOMs\sprior\sto\sentry\sinto\scolumnName(),\sas\n[forum/forumpost/fb6811c2f9|forum\spost\sfb6811c2f9]\sdemonstrates\sa\stechnique\nwhich\scould\scause\san\sOOM\sprior\sto\sentry\sinto\scolumnName().
-D 2023-04-27T23:59:51.813
+C In\sthe\sCLI,\searly\sout\sfrom\sthe\soutput_quoted_string()\sroutine\sif\sthe\ninput\sstring\sis\sNULL.\s\s[forum:/forumpost/8a22c0bfa7|forum\spost\s8a22c0bfa7].
+D 2023-04-28T00:19:55.495
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -634,7 +634,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 3b5633b7c78e51df21af693ce27cccca28e6118480060876d6be968c2f7a577c
+F src/shell.c.in dbd5bfe1c773115f4e526103807dc3c1484283cd8afe9cf759d64a338408f19f
 F src/sqlite.h.in 4fff9c6cc5d4cbba9532a668112efb6dc469c425e1a2196664d7c07d508363ef
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2060,8 +2060,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 4bbebb6bfb9910265d91b777c1711b3b8e0732bcf299f7459b20c4ea110422bd
-R 59c8d7a772734f630b5bf6fd205de302
+P a63346d6a0c0ca7ba4c87499de2e461be9c77e9b5d98f2bebf308cdb6599f33c
+R e1382566976c275dfea2ac91ab17df60
 U drh
-Z d29ba302c14b4aed5db886f9a3fc4bd5
+Z 06ecc62941bb9eb7ee780cf940024968
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b9ba76d6e8..250b4f032f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a63346d6a0c0ca7ba4c87499de2e461be9c77e9b5d98f2bebf308cdb6599f33c
\ No newline at end of file
+2881978d7b7014738a21c590b0430c4fa40e6b00b9547d0284b7656124523ae9
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index d7621c0c9e..18690214b5 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1860,6 +1860,7 @@ static void output_quoted_string(FILE *out, const char *z){
   int i;
   char c;
   setBinaryMode(out, 1);
+  if( z==0 ) return;
   for(i=0; (c = z[i])!=0 && c!='\''; i++){}
   if( c==0 ){
     utf8_printf(out,"'%s'",z);