Make sure the open_db() routine in the CLI does not invoke access() with

a NULL filename.

FossilOrigin-Name: 20a8c61122f37a43c418ca4415b3d26e0f7a27a6faea9048aa9fbb1a56e9d629

diff --git a/manifest b/manifest
index f71d013766895c2fa70f9023f8ad2735e14a86d0..dc6daabb49d6fe44e8c021a530c72cfbf6775d65 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\stest\scase\sto\scheck\sthat\sthe\sfts5\sunicode64\stokenizer\sis\sdealing\swith\ncodepoints\sgreater\sthan\s65535\scorrectly.
-D 2018-05-09T16:32:00.284
+C Make\ssure\sthe\sopen_db()\sroutine\sin\sthe\sCLI\sdoes\snot\sinvoke\saccess()\swith\na\sNULL\sfilename.
+D 2018-05-11T15:10:11.641
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@ -494,7 +494,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 6415381a0e9d22c0e7cba33ca4a53f81474190862f5d4838190f5eb5b0b47bc9
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c a35d462ee7a3c0856ad7a9d9c8921fbf3d91d911a8f39ad9d61302eb43b24a71
-F src/shell.c.in df233d5556008e330570da3dc4aa837af1df01d95ca5a15beb67b8515302c36a
+F src/shell.c.in c696c384e2067237896cd24189712f4f70c23a8eb0ba9bb1832f3f07df946eb5
 F src/sqlite.h.in ef7e6fae65cb40ba004abf090ea491751295c11e64b1446322813d3b473b9400
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9887b27e69c01e79c2cbe74ef73bf01af5b5703d6a7f0a4371e386d7249cb1c7
@@ -1728,7 +1728,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 0e809cdcbd1bb1e269298814d6bb1dcdaea48c5b0bb20e0e1caa4dba27654873
-R e51c8bac32b4be95015c654654bb5e45
-U dan
-Z 5d111675b7a56b1fabb524e83c5ed448
+P 9f7a6ae878cd17ff4de7c55e654406773e0ea2b9fe1c4e2a9fc2b0da84d059a4
+Q +2b8fd3b49724a613d95e1fe2c6898b6f82188b680a668c9e9b4189156cb84a5e
+R 98aed4b087832dbcab77376facef47ef
+U drh
+Z ae837db1ca0150cc4359c9abd43a4034

diff --git a/manifest.uuid b/manifest.uuid
index 90f9451592ea14d8c6a5d2cfd45e840ba2345192..ca10e2bfd9bae52c01e409826bf6cbcfc3e30711 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9f7a6ae878cd17ff4de7c55e654406773e0ea2b9fe1c4e2a9fc2b0da84d059a4
\ No newline at end of file
+20a8c61122f37a43c418ca4415b3d26e0f7a27a6faea9048aa9fbb1a56e9d629
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 1ea24fe5923efeea6bd3b00d4fe8b64ba3d055d4..244c78968ed88ca5a52b0ac8e61a1e0a59e13e5e 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3573,8 +3573,12 @@ static int deduceDatabaseType(const char *zName, int dfltZip){
 */
 static void open_db(ShellState *p, int keepAlive){
   if( p->db==0 ){
-    if( p->openMode==SHELL_OPEN_UNSPEC && access(p->zDbFilename,0)==0 ){
-      p->openMode = (u8)deduceDatabaseType(p->zDbFilename, 0);
+    if( p->openMode==SHELL_OPEN_UNSPEC ){
+      if( p->zDbFilename==0 || p->zDbFilename[0]==0 ){
+        p->openMode = SHELL_OPEN_NORMAL;
+      }else if( access(p->zDbFilename,0)==0 ){
+        p->openMode = (u8)deduceDatabaseType(p->zDbFilename, 0);
+      }
     }
     switch( p->openMode ){
       case SHELL_OPEN_APPENDVFS: {