From: drh <>
Date: Mon, 6 Dec 2021 16:56:06 +0000 (+0000)
Subject: Do not allow SQLITE_LIMIT_LENGTH to be set lower than 1 as an
X-Git-Tag: version-3.37.1~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8b877b3dd7c61eabd149f2ea3a3fb2504e6a8a2;p=thirdparty%2Fsqlite.git

Do not allow SQLITE_LIMIT_LENGTH to be set lower than 1 as an
SQLITE_LIMIT_LENGTH of 0 causes lots of unnecessary problems for
users of the sqlite3_str object.

FossilOrigin-Name: 286243f3a49f721b2ed5b278738e9edd8ca0f190abdbec645866bce97fcc7d04
---

diff --git a/manifest b/manifest
index 33b2dfe93c..17fb39815c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sallow\scertain\sdangerous\s".testctrl"\scommands\sin\ssafe\smode.
-D 2021-12-06T16:51:03.671
+C Do\snot\sallow\sSQLITE_LIMIT_LENGTH\sto\sbe\sset\slower\sthan\s1\sas\san\s\nSQLITE_LIMIT_LENGTH\sof\s0\scauses\slots\sof\sunnecessary\sproblems\sfor\nusers\sof\sthe\ssqlite3_str\sobject.
+D 2021-12-06T16:56:06.133
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -514,7 +514,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 7fcbbe9114ac402ea3c0c6a3810f13fc89cae8131ea1659ec472be7caac10192
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c e1dcff1c916bf6834e150b492eddda5d9792453182d2ad64294d2266b6e93c4c
-F src/main.c e94230dba03f44b73c52abc8b814468a0cb6d4a66d71af33452edd78ed1b1228
+F src/main.c 1ea70751e6005ab6a9f784730fa0919efaa6639440a287deb73cb711e5aae57a
 F src/malloc.c ef796bcc0e81d845d59a469f1cf235056caf9024172fd524e32136e65593647b
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -1933,8 +1933,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 b15c553c2ca3143c269e25f41e1a4e6c00f72a89e4b0a382260620567f159081
-Q +080e72d119b836c49916201bf135445aa7d53cefe40a47437a93448c4d0f41cd
-R 51cd582cb9955c5dc3be330e9d72a468
+P 4602644f858eb3b55fec0ead1de58de1f60cb85165cbb309bfe6bb136099a895
+Q +8fd5b8ec4ab9b5554d27f25a4638d56e347eab78b60900f24b15a815d3731330
+R 38d89c5246bd32fe865833fcca2fea74
 U drh
-Z 5e49a351a4154863e1f171f45499a747
+Z a3d8c2c0dc3baa5617e16ec1777530e4
diff --git a/manifest.uuid b/manifest.uuid
index 22264761dc..f04cb587e8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4602644f858eb3b55fec0ead1de58de1f60cb85165cbb309bfe6bb136099a895
\ No newline at end of file
+286243f3a49f721b2ed5b278738e9edd8ca0f190abdbec645866bce97fcc7d04
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index ce53496bc0..804719f176 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2857,6 +2857,8 @@ int sqlite3_limit(sqlite3 *db, int limitId, int newLimit){
   if( newLimit>=0 ){                   /* IMP: R-52476-28732 */
     if( newLimit>aHardLimit[limitId] ){
       newLimit = aHardLimit[limitId];  /* IMP: R-51463-25634 */
+    }else if( newLimit<1 && limitId==SQLITE_LIMIT_LENGTH ){
+      newLimit = 1;
     }
     db->aLimit[limitId] = newLimit;
   }