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

a NULL filename.

FossilOrigin-Name: 2b8fd3b49724a613d95e1fe2c6898b6f82188b680a668c9e9b4189156cb84a5e

diff --git a/manifest b/manifest
index eb951cf73b8b4735b9eb27d4167e3f8d1ba92ebb..a19a561bf4b4fd10994efa36ba6b4624bbc67da0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\stranslation\sin\sand\sout\sof\sGeoJSON\sautomatically\sadds\sor\sremoves\sthe\nredundant\slast\svertex,\sas\snecessary.
-D 2018-05-09T15:27:35.268
+C Make\ssure\sthe\sopen_db()\sroutine\sin\sthe\sCLI\sdoes\snot\sinvoke\saccess()\swith\na\sNULL\sfilename.
+D 2018-05-11T14:00:17.295
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@ -495,7 +495,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
@@ -1729,7 +1729,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 236588d573a007c9c9eb8e337387d3b6318d19c8b8f260fa7324ed8c4e17060b
-R ce0801999b26c2f522e752eaa60d3a97
+P 2653bedd9f8237d9ddef533a05e161a6afe6fa4af86fac47407b3df09dc2a9eb
+R a512caff5f8263131b31434be77c24df
 U drh
-Z f8b6d58cd5211c2e2594239d6fddec6f
+Z 9a2fc062eccf8788a12b18c622d5388f

diff --git a/manifest.uuid b/manifest.uuid
index 0118873a2e2709e8cdf6939f3d2b1e0397c16aff..838437214ffc5578b29f5218bbc16a9ed5fec96f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2653bedd9f8237d9ddef533a05e161a6afe6fa4af86fac47407b3df09dc2a9eb
\ No newline at end of file
+2b8fd3b49724a613d95e1fe2c6898b6f82188b680a668c9e9b4189156cb84a5e
\ 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: {