In the CLI, ensure that the argument to quoteChar() is not a NULL pointer

due to a prior OOM.

FossilOrigin-Name: 776d1a47aae3c3679a2d158595e84facf118adf2d1bca0f0642311dd346479b8

diff --git a/manifest b/manifest
index 1499169eac6deeb9a7d26527b3e38779fa78dd42..c99e7ab4be3211f9fc5f48f2b0fc283236db0c90 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sthe\ssqlite3changeset_size()\sAPI\sand\srowid\stables.
-D 2023-05-02T20:34:15.093
+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
 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 a835e8b580b771ed5a3cbaf7406b831dee4c9fc9b2bddd133c94c90ff9e2a9ba
+F src/shell.c.in e239f39df481a360dfedc6588c2c8666565096333b9e7a92474038679ca2bd7e
 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 aac8ac631de5c5b439c48c13f5fd271d76c11b1a5fd0919dfe4506ef7725f5ab
-R 61d9a9d2668f7db76ae5cd18e6e09935
-U dan
-Z 12f32504ba9b59579e904b79780ed5db
+P 92ade220dcf5c1b76a5db605b1467a01051271957cd26f790755904fd82772eb
+R a217a0d6fd378e2e6a946b83e8d0fa36
+U drh
+Z 51a1ea33dcd8dc62a0ce952364b1451a
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 782f599e129612143c9982c43627d7c779477c16..c1cfea91e4f4edee14b28341609085786bdb5431 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-92ade220dcf5c1b76a5db605b1467a01051271957cd26f790755904fd82772eb
\ No newline at end of file
+776d1a47aae3c3679a2d158595e84facf118adf2d1bca0f0642311dd346479b8
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 3fcd3e4a599339291b7eec5e1762c0f35fdcf1c1..cb033edeb943a04eb1c4ab51b5986c10a4c02a55 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1146,6 +1146,7 @@ static void appendText(ShellText *p, const char *zAppend, char quote){
 */
 static char quoteChar(const char *zName){
   int i;
+  if( zName==0 ) return '"';
   if( !isalpha((unsigned char)zName[0]) && zName[0]!='_' ) return '"';
   for(i=0; zName[i]; i++){
     if( !isalnum((unsigned char)zName[i]) && zName[i]!='_' ) return '"';