From: drh <drh@noemail.net>
Date: Mon, 11 Jun 2018 01:30:03 +0000 (+0000)
Subject: Always initialize the WhereClause.hasOr field that was added by check-in
X-Git-Tag: version-3.25.0~198
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c3549aa2ff44195e692601ab9e71f03e9481b82;p=thirdparty%2Fsqlite.git

Always initialize the WhereClause.hasOr field that was added by check-in
[292724ffc4].  Error detected by OSSFuzz.

FossilOrigin-Name: 9faf41713e865f26485d9e90918d77c25be211384941eadda6a36237f52c25de
---

diff --git a/manifest b/manifest
index 5757350e81..cba3248157 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sthe\samalgamation\sautoconf\sfile.
-D 2018-06-09T20:52:45.165
+C Always\sinitialize\sthe\sWhereClause.hasOr\sfield\sthat\swas\sadded\sby\scheck-in\n[292724ffc4].\s\sError\sdetected\sby\sOSSFuzz.
+D 2018-06-11T01:30:03.585
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@ -582,7 +582,7 @@ F src/walker.c da987a20d40145c0a03c07d8fefcb2ed363becc7680d0500d9c79915591f5b1f
 F src/where.c fe1a6f97c12cc9472ccce86166ba3f827cf61d6ae770c036a6396b63863baac4
 F src/whereInt.h b90ef9b9707ef750eab2a7a080c48fb4900315033274689def32d0cf5a81ebe4
 F src/wherecode.c 3317f2b083a66d3e65a03edf316ade4ccb0a99c9956273282ebb579b95d4ba96
-F src/whereexpr.c 6f022d6cc9daf56495f191b199352f783aff5cf268ba136b4d8cea3fb62d8c7d
+F src/whereexpr.c 19cf35cdd9bf6d5589d8a5c960d99259761136187a2319a6e14d11cf1abe14c2
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1731,7 +1731,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 538a365b7a32ab7fa84f59d7556242cfb59b76d287b6417eb3a823197a354e8e
-R 77cf712c0701790fbea387864fe5a9e7
+P de0857f39620b7f5c921ddf8d11b11723b4ba3cfe52e43cf77e883697b7c1c4c
+R d9b050cc4bb9b1726f913fdb83de4b6b
 U drh
-Z 8a05b9e91fe6e55c1781e9d15c271cb0
+Z 56f73bab2b8437d13f6f85f70d26e7dd
diff --git a/manifest.uuid b/manifest.uuid
index 78e429d619..2e3a89e74f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-de0857f39620b7f5c921ddf8d11b11723b4ba3cfe52e43cf77e883697b7c1c4c
\ No newline at end of file
+9faf41713e865f26485d9e90918d77c25be211384941eadda6a36237f52c25de
\ No newline at end of file
diff --git a/src/whereexpr.c b/src/whereexpr.c
index 3f349134ba..c027481025 100644
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -1409,6 +1409,7 @@ void sqlite3WhereClauseInit(
   WhereInfo *pWInfo        /* The WHERE processing context */
 ){
   pWC->pWInfo = pWInfo;
+  pWC->hasOr = 0;
   pWC->pOuter = 0;
   pWC->nTerm = 0;
   pWC->nSlot = ArraySize(pWC->aStatic);