From: dan <dan@noemail.net>
Date: Wed, 27 Jul 2016 16:03:54 +0000 (+0000)
Subject: Initialize a variable in where.c to avoid a valgrind warning.
X-Git-Tag: version-3.14.0~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d93ba6271b2d9e592dd27796f78bebdec09875ca;p=thirdparty%2Fsqlite.git

Initialize a variable in where.c to avoid a valgrind warning.

FossilOrigin-Name: 4d59df02d3713b3e3804e1a88e676749b2794286
---

diff --git a/manifest b/manifest
index 7f897eb954..185e06b3cc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\ssqlite3_scrub_backup()\sextension\screates\sa\sbackup\sdatabase\sat\sleast\sas\slarge\sas\sindicated\sby\sthe\sdatabase\sheader,\seven\sif\sthe\slast\spage\sof\sthe\sinput\sdatabase\sis\sa\sfree-list\sleaf.
-D 2016-07-26T10:46:21.988
+C Initialize\sa\svariable\sin\swhere.c\sto\savoid\sa\svalgrind\swarning.
+D 2016-07-27T16:03:54.108
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -463,7 +463,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
 F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
 F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
-F src/where.c 48eed8ebe319c6cbc7bf7682018f32af0f5189f5
+F src/where.c 9981707ac01438baea5caa0ca6108237be6630da
 F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
 F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
 F src/whereexpr.c d7dcbf14ce1b5876c1f76496162c30fcba669563
@@ -822,7 +822,7 @@ F test/hook.test 3b7b99d0eece6d279812c2aef6fa08bdfabc633e
 F test/icu.test 73956798bace8982909c00476b216714a6d0559a
 F test/ieee754.test 806fc0ce7f305f57e3331eaceeddcfec9339e607
 F test/imposter1.test c3f1db2d3db2c24611a6596a3fc0ffc14f1466c8
-F test/in.test 61a24ae38d4b64ec69f06ccdf022992f68a98176
+F test/in.test 61d940ced6817bee66e4e0b09d5bc8608f57134b
 F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
 F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
 F test/in4.test d2b38cba404bc4320f4fe1b595b3d163f212c068
@@ -1507,7 +1507,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 c0e7d98ef2a13ede5ae865083ede1aaffdf43310
-R 783c6677056c1c6297ef166e24fadbce
+P 483994a54dee3c7a3801e0e9d3c96fa9dbd8d2fd
+R d3646a4fd33e16c76415db60501a55b1
 U dan
-Z 42a389186c57610d077ea553714cade1
+Z 64999ea9da24ca9027e2e455a4d899cc
diff --git a/manifest.uuid b/manifest.uuid
index 1e810448d2..83f63152b3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-483994a54dee3c7a3801e0e9d3c96fa9dbd8d2fd
\ No newline at end of file
+4d59df02d3713b3e3804e1a88e676749b2794286
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index a65f30968e..23ec21c160 100644
--- a/src/where.c
+++ b/src/where.c
@@ -3949,7 +3949,7 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
       if( pWInfo->nOBSat<=0 ){
         pWInfo->nOBSat = 0;
         if( nLoop>0 ){
-          Bitmask m;
+          Bitmask m = 0;
           int rc = wherePathSatisfiesOrderBy(pWInfo, pWInfo->pOrderBy, pFrom,
                       WHERE_ORDERBY_LIMIT, nLoop-1, pFrom->aLoop[nLoop-1], &m);
           if( rc==pWInfo->pOrderBy->nExpr ){
diff --git a/test/in.test b/test/in.test
index 3a42e84b9a..3c87a2a86f 100644
--- a/test/in.test
+++ b/test/in.test
@@ -640,4 +640,15 @@ do_test in-13.X {
   db nullvalue ""
 } {}
 
+# At one point the following was causing valgrind to report a "jump
+# depends on unitialized location" problem.
+#
+do_execsql_test in-14.0 {
+  CREATE TABLE c1(a);
+  INSERT INTO c1 VALUES(1), (2), (4), (3);
+}
+do_execsql_test in-14.1 {
+  SELECT * FROM c1 WHERE a IN (SELECT a FROM c1) ORDER BY 1
+} {1 2 3 4}
+
 finish_test