Add safety margin on the CLI input buffer for tickets

[33aa4c0de8a62e33], [b97e6c5e6a91d97f], [2971fbe3f993e95a], and
[2971fbe3f993e95a].

FossilOrigin-Name: 741af08af1b93406a120580379d13e514524af627da5387ecfa6e442d004bfdd

diff --git a/manifest b/manifest
index 177214cf9673803530b0fdd72811a98fc58a2fd7..f9a814aac4d9cac99f29c7244711ecf17ab8818f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sassert()\sstatements\sthat\swould\s(incorrectly)\sfire\sif\san\sIF\sNOT\sEXISTS\ntrigger\sthat\salready\sexists\scontained\stwo\sor\smore\sRETURNING\sclauses.\nTickets\s[89d259d45b855a0d]\sand\s[d15b3a4ea901ef0d].
-D 2023-03-17T00:01:32.145
+C Add\ssafety\smargin\son\sthe\sCLI\sinput\sbuffer\sfor\stickets\n[33aa4c0de8a62e33],\s[b97e6c5e6a91d97f],\s[2971fbe3f993e95a],\sand\n[2971fbe3f993e95a].
+D 2023-03-17T00:42:27.613
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -626,7 +626,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 6a0253379cc15b3f80321362a61f487a8ef7cd2487fe62e1eb2317b3f871c61f
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 64a4b48a14f5d19a5ddc4afde37a435aebb92113f52653f8fe9e69fc3e9ff9aa
-F src/shell.c.in 3c62d4b5278a3d267a40aee82fefdd9324b59449bee983859040577838e6ae50
+F src/shell.c.in 55c54f1a48d7c78a0fca98a685ec6809b0ce8782169d441d7dd2c891dc07cfc3
 F src/sqlite.h.in f01033703156615566bb329144d736a37fc35a278049db91127782a9c799b938
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2050,8 +2050,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 12ad822d9b827777526ca5ed5bf3e678d600294fc9b5c25482dfff2a021328a4
-R 8a6f90bdd13ff84285687c30c2f9dc79
+P 648899e4ded72cac6cc24bccf7ebfc709ee7309a003452b21fd6ab0ba20c34b8
+R 669516456aeda41d2a3ee4cbf4f0ac18
 U drh
-Z e93c4e476e40be14bed110c238138789
+Z 314e43e240f0cb240b68efb4946e48cc
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9040daca11dc60139f036934a865261370e33335..7805e4d19ba0c1eef6e506887b9865db68240d3e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-648899e4ded72cac6cc24bccf7ebfc709ee7309a003452b21fd6ab0ba20c34b8
\ No newline at end of file
+741af08af1b93406a120580379d13e514524af627da5387ecfa6e442d004bfdd
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 892c3a5aa9a425de12061ee2c402a180d7838952..1f49a505651827817bd8242b5f2764fa280f7f03 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -11465,9 +11465,9 @@ static int process_input(ShellState *p){
     }
     /* No single-line dispositions remain; accumulate line(s). */
     nLine = strlen(zLine);
-    if( nSql+nLine+2>=nAlloc ){
+    if( nSql+nLine+8>=nAlloc ){
       /* Grow buffer by half-again increments when big. */
-      nAlloc = nSql+(nSql>>1)+nLine+100;
+      nAlloc = nSql+(nSql>>1)+nLine+104;
       zSql = realloc(zSql, nAlloc);
       shell_check_oom(zSql);
     }