From: drh <>
Date: Mon, 20 Mar 2023 10:43:52 +0000 (+0000)
Subject: Back out the extra margin added to the input buffer of the CLI, as it is not
X-Git-Tag: version-3.42.0~241
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3ddaaa89a12d4431461bfdb3c35c74341ed3c65;p=thirdparty%2Fsqlite.git

Back out the extra margin added to the input buffer of the CLI, as it is not
needed.

FossilOrigin-Name: ac8d1e5de5da35fa93c3f9241a7817285920431c66f4e4593d4d5c2db9f2b960
---

diff --git a/manifest b/manifest
index 606ad4918a..55f4c5fe5b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C A\sbetter\sfix\sfor\sthe\ssqlite3_error_offset()\sproblem\son\sgenerated\scolumns.
-D 2023-03-20T01:55:39.149
+C Back\sout\sthe\sextra\smargin\sadded\sto\sthe\sinput\sbuffer\sof\sthe\sCLI,\sas\sit\sis\snot\nneeded.
+D 2023-03-20T10:43:52.546
 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 b47c3489777c6bb7b30c049bef3ef925528c19fbb53d980d772d0b8e8841db8f
+F src/shell.c.in 7394f84ace7bcff18c686b09ff7a1c02ffc5fb8fb851b3b2be128762ee71589e
 F src/sqlite.h.in f01033703156615566bb329144d736a37fc35a278049db91127782a9c799b938
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2051,8 +2051,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2adb4e0dda471ffc9b2a5cbad01b6c2bc6091b7526a8c8b19944cb2d4a5111e7
-R 6c29c6313761fba8300293fe905fb541
+P 770b3e67c89ca16b08a9234acb626917a26ea414b3bc0340f9601644cb7504f2
+Q -741af08af1b93406a120580379d13e514524af627da5387ecfa6e442d004bfdd
+R 6fce8a37edd3eccfb817f05a356bd030
 U drh
-Z ca1ef3f48c098aade28ded216a6d7df7
+Z 0c2311a8849988977130c5a153101397
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b0bf79293a..ce4eb878f2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-770b3e67c89ca16b08a9234acb626917a26ea414b3bc0340f9601644cb7504f2
\ No newline at end of file
+ac8d1e5de5da35fa93c3f9241a7817285920431c66f4e4593d4d5c2db9f2b960
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 8e2ad1cb23..199a6df9dd 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -11466,9 +11466,9 @@ static int process_input(ShellState *p){
     }
     /* No single-line dispositions remain; accumulate line(s). */
     nLine = strlen(zLine);
-    if( nSql+nLine+8>=nAlloc ){
+    if( nSql+nLine+2>=nAlloc ){
       /* Grow buffer by half-again increments when big. */
-      nAlloc = nSql+(nSql>>1)+nLine+104;
+      nAlloc = nSql+(nSql>>1)+nLine+100;
       zSql = realloc(zSql, nAlloc);
       shell_check_oom(zSql);
     }