Make sure the input buffer is big enough for an memcpy() when doing the

restore autodetection in the shell.

FossilOrigin-Name: 1637d29d518b3b4534a1b4c0dc0eddcb770f6f71763e4177812a3e79b97d2365

diff --git a/manifest b/manifest
index d42c57accb29d7a0a6b15b12953d3aad466f7157..9200a9a3a85ec953295440ecf799e97bc0e4e0e3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s"-d\sSECS"\soption\sto\sthe\s"status"\scommand\sof\stestrunner.tcl
-D 2024-08-02T17:36:34.415
+C Make\ssure\sthe\sinput\sbuffer\sis\sbig\senough\sfor\san\smemcpy()\swhen\sdoing\sthe\nrestore\sautodetection\sin\sthe\sshell.
+D 2024-08-02T18:20:10.582
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -760,7 +760,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 7e8d23ce7cdbfedf351a47e759f2722e8182ca10fd7580be43f4ce1f1a228145
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 6a95a2bffa6c09584dea99db5a7ae10c813305c09c92920ffc54f6eae2ba399e
-F src/shell.c.in 44c02fd1581d95e066b479241e081f37dc95c98452badd03627ef2a1c21bdc80
+F src/shell.c.in 271bc66d805cedc9064d6218434bdaadb207d917dcecb4f46c17e5ff66085590
 F src/sqlite.h.in 1ad9110150773c38ebababbad11b5cb361bcd3997676dec1c91ac5e0416a7b86
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2202,8 +2202,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c38734f57509c50dd28029738dd602600950703b773d9b7b60fdb1dcb06e8fd8
-R 83c1979a453bc44130a53ce766cc177f
+P 2151ea31632f7aa363c7d4b7205e1174a45d710783a8efad8176049d356cfc70
+R 4661deca42f48a6dcbd9a9e1fd37e56e
 U drh
-Z 6d452c8f357818d9c3aa4547edb14d11
+Z dd91b61800449a04528ebdc3156c12eb
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 304debfec0c1a0a856e39171411717d3579998a6..40805aee4e2af4385c34b9ed5d6dfef86ea3fe5d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2151ea31632f7aa363c7d4b7205e1174a45d710783a8efad8176049d356cfc70
+1637d29d518b3b4534a1b4c0dc0eddcb770f6f71763e4177812a3e79b97d2365

diff --git a/src/shell.c.in b/src/shell.c.in
index f389c1f4758324e1c96ada67b7144e9bb2b755ec..eea87b2dc781b423e3094389a12d9b796677cc29 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -11640,7 +11640,10 @@ static int doAutoDetectRestore(ShellState *p, const char *zSql){
       case 0: {
         const char *zExpect = "PRAGMA foreign_keys=OFF;";
         assert( strlen(zExpect)==24 );
-        if( p->bSafeMode==0 && memcmp(zSql, zExpect, 25)==0 ){
+        if( p->bSafeMode==0
+         && strlen(zSql)>=25
+         && memcmp(zSql, zExpect, 25)==0
+        ){
           p->eRestoreState = 1;
         }else{
           p->eRestoreState = 7;