From: larrybr <larrybr@noemail.net>
Date: Mon, 6 Mar 2023 21:38:38 +0000 (+0000)
Subject: Cause CLI to fail noisily when deserialize option used for non-seekable "file".
X-Git-Tag: version-3.42.0~284^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51a31a3b9cdb4cab6f9c57764f3f216f06f2911f;p=thirdparty%2Fsqlite.git

Cause CLI to fail noisily when deserialize option used for non-seekable "file".

FossilOrigin-Name: 24bd7e82471925987d924188ce0f80ed4f282b10ea1022e42881a7f529814eb9
---

diff --git a/manifest b/manifest
index d174bd6ab1..c702837d55 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sSQLITE_DBCONFIG_REVERSE_SCANORDER\sfor\sdirect\sC-language\saccess\sto\sthe\n"PRAGMA\sreverse_unordered_selects"\ssetting.
-D 2023-03-06T19:04:39.903
+C Cause\sCLI\sto\sfail\snoisily\swhen\sdeserialize\soption\sused\sfor\snon-seekable\s"file".
+D 2023-03-06T21:38:38.217
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -624,7 +624,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 4233c3030341bf1a21cea90890e6b3d3531721acc62ede147e899d36ffad8238
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 2f38b8424d204f79180acc6adf84cf3a35a5176e33bc6b009f9a9f080316d4bb
-F src/shell.c.in db8355bd674fb3ef335f2ca07d7ad8a7512570104eee3ba520cb259c17912b0a
+F src/shell.c.in d64f0d3822aa94508285f2bcce185b12ace06f37c953371cb0f0d835c171753c
 F src/sqlite.h.in f01033703156615566bb329144d736a37fc35a278049db91127782a9c799b938
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2048,8 +2048,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 af312b131457743d98b84137bd51d9ba60e0daf0bd8f5a66f05956ca35ab68fb
-R ad7078f08d1f30e27457cbb0b25465a3
-U drh
-Z f646de84c6f7cf615b430f5fcccad8cd
+P 83e84531b46814aea6dad1ce8283cb9f6b90ad52badb60b875ea8f66e4ac0925
+R 3c62467c095e93d2ca950eedb1046af5
+U larrybr
+Z f621c03954d1f84da6a769a9d8f7abaa
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 238d5abcd3..befb930ec1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-83e84531b46814aea6dad1ce8283cb9f6b90ad52badb60b875ea8f66e4ac0925
\ No newline at end of file
+24bd7e82471925987d924188ce0f80ed4f282b10ea1022e42881a7f529814eb9
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index b76e44f45b..6b9e2b3545 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -4894,16 +4894,27 @@ static char *readFile(const char *zName, int *pnByte){
   long nIn;
   size_t nRead;
   char *pBuf;
+  int rc;
   if( in==0 ) return 0;
-  fseek(in, 0, SEEK_END);
+  rc = fseek(in, 0, SEEK_END);
+  if( rc!=0 ){
+    raw_printf(stderr, "Error: '%s' not seekable\n", zName);
+    fclose(in);
+    return 0;
+  }
   nIn = ftell(in);
   rewind(in);
   pBuf = sqlite3_malloc64( nIn+1 );
-  if( pBuf==0 ){ fclose(in); return 0; }
+  if( pBuf==0 ){
+    raw_printf(stderr, "Error: out of memory\n");
+    fclose(in);
+    return 0;
+  }
   nRead = fread(pBuf, nIn, 1, in);
   fclose(in);
   if( nRead!=1 ){
     sqlite3_free(pBuf);
+    raw_printf(stderr, "Error: cannot read '%s'\n", zName);
     return 0;
   }
   pBuf[nIn] = 0;
@@ -5398,9 +5409,9 @@ static void open_db(ShellState *p, int openFlags){
         aData = (unsigned char*)readFile(zDbFilename, &nData);
       }else{
         aData = readHexDb(p, &nData);
-        if( aData==0 ){
-          return;
-        }
+      }
+      if( aData==0 ){
+        return;
       }
       rc = sqlite3_deserialize(p->db, "main", aData, nData, nData,
                    SQLITE_DESERIALIZE_RESIZEABLE |
@@ -8039,7 +8050,6 @@ static int do_meta_command(char *zLine, ShellState *p){
       raw_printf(stderr, "Usage: .check GLOB-PATTERN\n");
       rc = 2;
     }else if( (zRes = readFile("testcase-out.txt", 0))==0 ){
-      raw_printf(stderr, "Error: cannot read 'testcase-out.txt'\n");
       rc = 2;
     }else if( testcase_glob(azArg[1],zRes)==0 ){
       utf8_printf(stderr,