Fix for [9abd6aa831]. Do not overread a buffer used for an %q or %w conversion with...

FossilOrigin-Name: 5e472896e02eed05c6c0886a48acd0bdc7a38731

diff --git a/manifest b/manifest
index 2ec3b210825fc40ee29af1ac3895f719d961e2f4..85c5be655ea8662ec7cbabeff8c47c6a11559364 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Fix\san\suninitialized\svariable\sin\sprintf\swhen\scompiling\swith\nSQLITE_OMIT_FLOATING_POINT.
-D 2010-03-04T17:11:31
+C Fix\sfor\s[9abd6aa831].\sDo\snot\soverread\sa\sbuffer\sused\sfor\san\s%q\sor\s%w\sconversion\swith\sa\sprecision\sspecifier.
+D 2010-03-04T17:58:45
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -163,7 +160,7 @@ F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
 F src/pcache1.c 2bb2261190b42a348038f5b1c285c8cef415fcc8
 F src/pragma.c 56d95f76154a5f873c32eae485bb625f3c70be46
 F src/prepare.c c80630169d82945070a50ebf298611fd9f1485f1
-F src/printf.c 8146d9ff92e3b8537a0920227db2084bbf982af0
+F src/printf.c 5f5b65a83e63f2096a541a340722a509fa0240a7
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c a1648d98e869937b29f4f697461fe4d60f220a7b
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
@@ -795,14 +792,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P fc2c63ac78ba7d48fe3232f88093e980ea34eaa9
-R 43cc6e7ff9a4680025e726c0d240b1da
-U drh
-Z 4def4d063db2e1a5f3b1e13c47bfcd40
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFLj+nGoxKgR168RlERAikYAJ0cW4uYXCeI1nWEu59dxDEudwsB4QCfSKue
-llizsBy+cotVHqSrdQLth+0=
-=5EUf
------END PGP SIGNATURE-----
+P 14ad62b9a54dba5c5a2d4a994bcd4be6ab6e711f
+R 77848a5a664026af8d7d5cde853f6424
+U dan
+Z 8c8ae9dac09dd905c67187f5d19d475d

diff --git a/manifest.uuid b/manifest.uuid
index d71b69ddd7ff8cd605f2e2554d59f4647685430c..e98fcb4723b3aa9edc7bf56bb6e8d82f4dde4dc8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-14ad62b9a54dba5c5a2d4a994bcd4be6ab6e711f
\ No newline at end of file
+5e472896e02eed05c6c0886a48acd0bdc7a38731
\ No newline at end of file

diff --git a/src/printf.c b/src/printf.c
index 333cfbdc16a7acf4440b76cf6b5613ae6ea1adf2..6ab230b88692b922362a9f074e3f03a4e8ccc662 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -655,7 +655,7 @@ void sqlite3VXPrintf(
         isnull = escarg==0;
         if( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
         k = precision;
-        for(i=n=0; (ch=escarg[i])!=0 && k!=0; i++, k--){
+        for(i=n=0; k!=0 && (ch=escarg[i])!=0; i++, k--){
           if( ch==q )  n++;
         }
         needQuote = !isnull && xtype==etSQLESCAPE2;