Fix an uninitialized variable in printf when compiling with

SQLITE_OMIT_FLOATING_POINT.

FossilOrigin-Name: 14ad62b9a54dba5c5a2d4a994bcd4be6ab6e711f

diff --git a/manifest b/manifest
index 6d6843a3fa327fa90964655669010ee176259881..2ec3b210825fc40ee29af1ac3895f719d961e2f4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Suppress\sharmless\scompiler\swarnings.
-D 2010-03-04T16:12:34
+C Fix\san\suninitialized\svariable\sin\sprintf\swhen\scompiling\swith\nSQLITE_OMIT_FLOATING_POINT.
+D 2010-03-04T17:11:31
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -163,7 +163,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 10b7034923dae17e7540ca77aa9cddcb28f4c75f
+F src/printf.c 8146d9ff92e3b8537a0920227db2084bbf982af0
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c a1648d98e869937b29f4f697461fe4d60f220a7b
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
@@ -795,14 +795,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 5322d1df5ba981001d248b7fb2ee02281e4f9723
-R 8518eb4aa88e157fd575727ed4a44d56
+P fc2c63ac78ba7d48fe3232f88093e980ea34eaa9
+R 43cc6e7ff9a4680025e726c0d240b1da
 U drh
-Z b40a37769134e1c148f3f0d5e007c480
+Z 4def4d063db2e1a5f3b1e13c47bfcd40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLj9v2oxKgR168RlERAlDTAJ96DQjq56uSJZBAaoHGSC19cEzB6QCfe07F
-8QzCK3CiczCBfiQDcZd+HXw=
-=HTRs
+iD8DBQFLj+nGoxKgR168RlERAikYAJ0cW4uYXCeI1nWEu59dxDEudwsB4QCfSKue
+llizsBy+cotVHqSrdQLth+0=
+=5EUf
 -----END PGP SIGNATURE-----

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

diff --git a/src/printf.c b/src/printf.c
index ab2cfcc64f6dafffd4992da857535a32e13c0ab3..333cfbdc16a7acf4440b76cf6b5613ae6ea1adf2 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -460,7 +460,9 @@ void sqlite3VXPrintf(
       case etEXP:
       case etGENERIC:
         realvalue = va_arg(ap,double);
-#ifndef SQLITE_OMIT_FLOATING_POINT
+#ifdef SQLITE_OMIT_FLOATING_POINT
+        length = 0;
+#else
         if( precision<0 ) precision = 6;         /* Set default precision */
         if( precision>etBUFSIZE/2-10 ) precision = etBUFSIZE/2-10;
         if( realvalue<0.0 ){
@@ -606,7 +608,7 @@ void sqlite3VXPrintf(
           while( nPad-- ) bufpt[i++] = '0';
           length = width;
         }
-#endif
+#endif /* !defined(SQLITE_OMIT_FLOATING_POINT) */
         break;
       case etSIZE:
         *(va_arg(ap,int*)) = pAccum->nChar;