From: drh <drh@noemail.net>
Date: Tue, 6 Mar 2018 02:00:20 +0000 (+0000)
Subject: Merge the walIteratorInit() fix from trunk.
X-Git-Tag: version-3.23.0~85^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcdb28dff3ccd13bb926acff7338b9ce3146b0a0;p=thirdparty%2Fsqlite.git

Merge the walIteratorInit() fix from trunk.

FossilOrigin-Name: 6399e101d5f6b8582640e0d90783e56042eaa1600db3bd02f8df5e7b01ac1cab
---

bcdb28dff3ccd13bb926acff7338b9ce3146b0a0
diff --cc manifest
index cd6681b82f,8c32f61309..0daa75ee51
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sthe\ssession\sfix\sfrom\strunk.
- D 2018-03-05T21:19:57.440
 -C Fix\swalIteratorInit()\sso\sthat\sit\salways\sleaves\sthe\siterator\sas\sa\sNULL\spointer\nif\san\sOOM\soccurs.\s\sThis\sfixes\san\sassertion\sfault\sintroduced\sby\s\ncheck-in\s[044b0b65e716bff].
 -D 2018-03-05T23:23:28.467
++C Merge\sthe\swalIteratorInit()\sfix\sfrom\strunk.
++D 2018-03-06T02:00:20.576
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 -F Makefile.in a2d2fb8d17c39ab5ec52beb27850b903949080848236923f436156b72a958737
 +F Makefile.in 1d5a68043cc4d8a6e45b37e2639b148cdd7973aa75e90ec71e12d55cd95e32c0
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc bf19d3a0eb849bd3b114653b0e455aa5b2799a96f413287a5866013db0e47f30
 +F Makefile.msc 28df1e20dd77b9613ce5b65659a4ab9ab19a1f0d885f1eae2399baf0ebc43f46
  F README.md 1d5342ebda97420f114283e604e5fe99b0da939d63b76d492eabbaae23488276
  F VERSION cdf91ac446255ecf3d8f6d8c3ee40d64123235ae5b3cef29d344e61b45ec3759
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1710,7 -1708,7 +1710,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 99c02aeecf47bfa5be5ce38a7ec20818ea0f9fb960b136184e1cb6f8fb8b70e5 7e70c9b86af557e86152748ddf1da467e62817b35df1da0d7d3b67941b198897
- R acb69ad1080a51e22610a417d769018c
 -P 7e70c9b86af557e86152748ddf1da467e62817b35df1da0d7d3b67941b198897
 -R 8e40d6345e942fd404ec54ebfeaa69d8
++P 6274cf1f397d36be9e9b65b1935a776c834e4512e0e89f82c132efd4d1e8ef82 e5ce256aa1f7a8ae995b79c9da895827bee5d8d0724fc15413ff203dc9e2602d
++R 4fdec0179640fc276902d16463f8cb6d
  U drh
- Z 437589d094a82dcb6a39fdcd8a54051a
 -Z f09301629be2ce9f9dae3a5519749c5f
++Z bbb52f4afaed03841603241952a4da37
diff --cc manifest.uuid
index 1c1690f190,feb65fba83..854da70375
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6274cf1f397d36be9e9b65b1935a776c834e4512e0e89f82c132efd4d1e8ef82
 -e5ce256aa1f7a8ae995b79c9da895827bee5d8d0724fc15413ff203dc9e2602d
++6399e101d5f6b8582640e0d90783e56042eaa1600db3bd02f8df5e7b01ac1cab