Fix an uninitialized variable and a misuse of memcpy().

FossilOrigin-Name: ee110d5a4a6f29400bb632a9a18c7dcd04638657

diff --git a/manifest b/manifest
index 7f7797b145f450fbfa5b46a4b05064611616d35f..0e783c5618287d28ecb4f2c9ff31bdc53901c646 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Pull\sin\sthe\slatest\schanges\sfrom\strunk.\s\sUpdate\sthe\sSTAT3\sdocumentation.
-D 2011-09-21T00:09:41.245
+C Fix\san\suninitialized\svariable\sand\sa\smisuse\sof\smemcpy().
+D 2011-09-22T00:28:55.958
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -118,7 +118,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
 F src/alter.c ac80a0f31189f8b4a524ebf661e47e84536ee7f5
-F src/analyze.c 002e085428c9b2dda5b25f43539178d31c124525
+F src/analyze.c 78a513d6229689c40252aa5d820565bcba90634c
 F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 28a4fe55327ff708bfaf9d4326d02686f7a553c3
@@ -251,7 +251,7 @@ F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
 F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9
 F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
-F src/where.c da04df6f003024bd217da9afb369e751417e07da
+F src/where.c bd9ca1bb5ab909b04bdba6da2fffdfe07207c655
 F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@ -965,7 +965,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 9607600b6ca9b546dd248982fd8e8d64f708be5c 36be31ff0af7f811fe2c6f7e26f058cffb7257e1
-R bd162fa2b501bed3d79b1607f9710e81
+P 63fc3e4bea6a7f5dc34b2af83f30458eb10b8fe0
+R 21208cbb3e90ead0385f6f34c9d78ada
 U drh
-Z 642a2c81deaec7b7de912d100473111b
+Z 173e771ada64f444efa1679d0416f2ab

diff --git a/manifest.uuid b/manifest.uuid
index d79b87d27f1b7d95029a0caadb33ddd424c93cd6..bcbf1257fb4c632ccf199e091fd19b9ab6b39e94 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-63fc3e4bea6a7f5dc34b2af83f30458eb10b8fe0
\ No newline at end of file
+ee110d5a4a6f29400bb632a9a18c7dcd04638657
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 6e33db8c9bf649ff8efdde6de01dfee771f9fecb..251560f14ed3d50c34dba67673bbb21aa61fa553 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -339,7 +339,7 @@ static void stat3Push(
   if( !doInsert ) return;
   if( p->nSample==p->mxSample ){
     if( iMin<p->nSample ){
-      memcpy(&p->a[iMin], &p->a[iMin+1], sizeof(p->a[0])*(p->nSample-iMin));
+      memmove(&p->a[iMin], &p->a[iMin+1], sizeof(p->a[0])*(p->nSample-iMin-1));
     }
     pSample = &p->a[p->nSample-1];
   }else{

diff --git a/src/where.c b/src/where.c
index 962a9dbf7ee1fd196f8dfb5e258a22147ff02735..db076ebaf00011e66245fa9f2a1c999ff4a4beb3 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -2925,7 +2925,7 @@ static void bestBtreeIndex(
     const tRowcnt * const aiRowEst = pProbe->aiRowEst;
     double cost;                /* Cost of using pProbe */
     double nRow;                /* Estimated number of rows in result set */
-    double log10N;              /* base-10 logarithm of nRow (inexact) */
+    double log10N = (double)1;  /* base-10 logarithm of nRow (inexact) */
     int rev;                    /* True to scan in reverse order */
     int wsFlags = 0;
     Bitmask used = 0;