Improved error handling for the ".open --hexdb" command of the CLI.

FossilOrigin-Name: 4fa831d5cd5861f6a0a8f08a738b2d4d371fb2a788178ce86482c5bba761f9de

diff --git a/manifest b/manifest
index c2b166084643888312390fe20421bdd05da35894..b835f636fb27158621e691a4b028e0f9c6874f27 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\ssqlite3BtreeLast()\sinterface\sinitializes\sthe\s*pRes\sreturn\nto\szero\sif\sthe\scursor\sis\salready\ssitting\son\sthe\slast\sentry\sof\sthe\stable.
-D 2019-05-08T23:55:04.921
+C Improved\serror\shandling\sfor\sthe\s".open\s--hexdb"\scommand\sof\sthe\sCLI.
+D 2019-05-09T11:18:41.366
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -522,7 +522,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 408632d9531ca8f1df8591f00530797daaa7bde3fe0d3211de4d431cbb99347e
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c ef860c7e5882c89c030432a6d2cf13c67d1d51fd511cf45cbdfd5c2faf44d51d
-F src/shell.c.in 5470f08809ca5d9ac79f782f8f16d96a4299e584dbc456d8ef4aa6ca0824b5b3
+F src/shell.c.in 5d0e2b03f977a475700c4c535df74e753171d27ec4a50e1a5ec0090357008f05
 F src/sqlite.h.in 0605c88d98c85fbcba8bbd9716e7cc10b361e7b21cf2375171130f577388c943
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
@@ -1825,7 +1825,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 51d32173ff1f610b5d75a50f20fa1e0e4e22046299869e3b82e0bb446dba890c
-R 18700b334a433dab3b562877ac4a0a65
+P ebe4845cd0ffb96b30be3c69eb399d58e93149886bc2fa60a7ebd7b4fbe447a4
+R 8e29ce757aa66674b46f1ad295c560b5
 U drh
-Z f8fe35a5ae505a0883dbd5eaecee59b1
+Z 58b67e014ab5b3e97fafa9cfec65dfaa

diff --git a/manifest.uuid b/manifest.uuid
index 031f7c103715b919e96c17b4484b3daa04313ef5..adb46ef5c34d3a17087e29d9615d3c469f6183ef 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ebe4845cd0ffb96b30be3c69eb399d58e93149886bc2fa60a7ebd7b4fbe447a4
\ No newline at end of file
+4fa831d5cd5861f6a0a8f08a738b2d4d371fb2a788178ce86482c5bba761f9de
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index fa8554ad769fe1fb419307d20530c09eb7e8adcb..d4c6019f1fe370b8435fe3d9455624d4a30c2177 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3884,8 +3884,8 @@ static unsigned char *readHexDb(ShellState *p, int *pnData){
   if( fgets(zLine, sizeof(zLine), in)==0 ) goto readHexDb_error;
   rc = sscanf(zLine, "| size %d pagesize %d", &n, &pgsz);
   if( rc!=2 ) goto readHexDb_error;
-  if( n<=0 ) goto readHexDb_error;
-  a = sqlite3_malloc( n );
+  if( n<0 ) goto readHexDb_error;
+  a = sqlite3_malloc( n ? n : 1 );
   if( a==0 ){
     utf8_printf(stderr, "Out of memory!\n");
     goto readHexDb_error;
@@ -3924,7 +3924,7 @@ static unsigned char *readHexDb(ShellState *p, int *pnData){
   return a;
 
 readHexDb_error:
-  if( in!=stdin ){
+  if( in!=p->in ){
     fclose(in);
   }else{
     while( fgets(zLine, sizeof(zLine), p->in)!=0 ){
@@ -4166,7 +4166,6 @@ static void open_db(ShellState *p, int openFlags){
       }else{
         aData = readHexDb(p, &nData);
         if( aData==0 ){
-          utf8_printf(stderr, "Error in hexdb input\n");
           return;
         }
       }