Fix a potential SQLITE_MISUSE in the .excel command when no database is open.

FossilOrigin-Name: 9b95ff1abfb8d49bbe5a727f5c917a455e4289b4d69196377dc9294409341d70

diff --git a/manifest b/manifest
index 751835d013662afdc8efa4a4fcc3ce39c5da9fdc..6b08444735a611ee238ca1e477b3bd0e5605d68d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\sthe\s".excel"\scommand\s(and\s".once\s-e"\sand\s".once\s-x")\sin\nthe\sCLI.
-D 2018-01-10T21:41:55.211
+C Fix\sa\spotential\sSQLITE_MISUSE\sin\sthe\s.excel\scommand\swhen\sno\sdatabase\sis\sopen.
+D 2018-01-10T21:50:08.964
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 38f84f301cbef443b2d269f67a74b8cc536469831f70df7c3e912acc04932cc2
@@ -484,7 +484,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bbee7e31d369a18a2f4836644769882e9c5d40ef4a3af911db06410b65cb3730
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 8b22abe193e4d8243befa2038e4ae2405802fed1c446e5e502d11f652e09ba74
-F src/shell.c.in d1dbc1514d74b425db41be006f2a4f91d26c5e1c2db4ab198b45c12920171e11
+F src/shell.c.in 362e3af76b80c3bd688f1f6fc8df407e651b71a65f0d919287eb6db5c357260c
 F src/sqlite.h.in 1f1a2da222ec57465794e8984d77f32d0bd0da80cdc136beadda461a0be9d80c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
@@ -1697,10 +1697,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 60c694c1ab26a7a096f17ccea5a93ecda0f9f2113ab5fdc8b17dbffc787724fc
-R bd40eb18946fee4f15d02cd4e13ad69c
-T *branch * excel-shell-cmd
-T *sym-excel-shell-cmd *
-T -sym-trunk *
+P 23fa7c57c2b204d1ddcc2a939b5271628cf26689ad4ede6976038113095a9801
+R ba511ddf16c10fcf8fdff3518b957cd4
 U drh
-Z f708fb338ffb9679393be576ce4d2140
+Z 0681d6d553d7112baca91b9b1918eb9d

diff --git a/manifest.uuid b/manifest.uuid
index 5bb31c1d62c7323aab033c2981bca020c276bb65..4442a7e3cfd1e4bd0b4e3232e3e1060e11411864 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-23fa7c57c2b204d1ddcc2a939b5271628cf26689ad4ede6976038113095a9801
\ No newline at end of file
+9b95ff1abfb8d49bbe5a727f5c917a455e4289b4d69196377dc9294409341d70
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 81677bf5e8af3726a9c723d8d1a096f98b28db2f..c76b3054507ffb84211d1d48d07863247b77820a 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -4234,7 +4234,9 @@ static void newTempFile(ShellState *p, const char *zSuffix){
   clearTempFile(p);
   sqlite3_free(p->zTempFile);
   p->zTempFile = 0;
-  sqlite3_file_control(p->db, 0, SQLITE_FCNTL_TEMPFILENAME, &p->zTempFile);
+  if( p->db ){
+    sqlite3_file_control(p->db, 0, SQLITE_FCNTL_TEMPFILENAME, &p->zTempFile);
+  }
   if( p->zTempFile==0 ){
     sqlite3_uint64 r;
     sqlite3_randomness(sizeof(r), &r);