From: drh <drh@noemail.net>
Date: Mon, 25 May 2020 15:41:03 +0000 (+0000)
Subject: Extra assert() statements in the printf() logic.
X-Git-Tag: version-3.32.1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6907e299370683129fd6a7380ba052ee7b11a0e;p=thirdparty%2Fsqlite.git

Extra assert() statements in the printf() logic.

FossilOrigin-Name: b1b182be2ab34cec1d94c5570bc361331a34f727eb9fa4aadfabb7f1ef79f83e
---

diff --git a/manifest b/manifest
index a59fff912d..5ccf836e5d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Defensive\scode\sthat\stries\sto\sprevent\sa\srecurrence\sof\sproblems\slike\sthe\none\sdescribed\sin\sticket\s[7a5279a25c57adf1]
-D 2020-05-25T15:19:52.511
+C Extra\sassert()\sstatements\sin\sthe\sprintf()\slogic.
+D 2020-05-25T15:41:03.801
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -529,7 +529,7 @@ F src/pcache1.c 6596e10baf3d8f84cc1585d226cf1ab26564a5f5caf85a15757a281ff977d51a
 F src/pragma.c 1b0db48177e52b256c003b8dc6ac708b1079a82cded944a23820574586a4731f
 F src/pragma.h 8168e588536bffd95319451f34e9a754dc37d205ebe433031a7813c5b286beae
 F src/prepare.c 8d4d6c8aa6afefc48027c54b41cdf134b4d6bc2fc4badbe483ad7fd9e1728a28
-F src/printf.c c558075d06f0c83b0471499cebd30ef979e600709cde1e2b744abadcf52c7ba2
+F src/printf.c 94b5419ad0a17269f76a9e968ca19cf9fa37617abed2e246fc48844e511b6bc6
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c c2008519a0654f1e7490e9281ed0397d0f14bb840d81f0b96946248afcbdb25d
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
@@ -1866,7 +1866,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 3261ee9ec26bbeaa64190c12556a1d8146270b6660c70004830bd38c1b5b63f4
-R e34a1f962ac5984191c7a26f2bb9dcc0
+P 572105de1d44bca4f18c99d373458889163611384eebbc9659474874ee1701f4
+R 060d4022d9a6a2267bacd2bd89abcc90
 U drh
-Z b86a7669719466f4efe7df019d717545
+Z a8ddab7e601365298b675d3fa3c141bd
diff --git a/manifest.uuid b/manifest.uuid
index 2e0598a04e..0d03b644b5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-572105de1d44bca4f18c99d373458889163611384eebbc9659474874ee1701f4
\ No newline at end of file
+b1b182be2ab34cec1d94c5570bc361331a34f727eb9fa4aadfabb7f1ef79f83e
\ No newline at end of file
diff --git a/src/printf.c b/src/printf.c
index 4505a5675e..ae957022a1 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -401,6 +401,8 @@ void sqlite3_str_vappendf(
     **   xtype                       The class of the conversion.
     **   infop                       Pointer to the appropriate info struct.
     */
+    assert( width>=0 );
+    assert( precision>=(-1) );
     switch( xtype ){
       case etPOINTER:
         flag_long = sizeof(char*)==sizeof(i64) ? 2 :
@@ -809,7 +811,7 @@ void sqlite3_str_vappendf(
         }
         isnull = escarg==0;
         if( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
-        /* For %q, %Q, and %w, the precision is the number of byte (or
+        /* For %q, %Q, and %w, the precision is the number of bytes (or
         ** characters if the ! flags is present) to use from the input.
         ** Because of the extra quoting characters inserted, the number
         ** of output characters may be larger than the precision.