Merge the walIteratorInit() fix from trunk.

FossilOrigin-Name: 6399e101d5f6b8582640e0d90783e56042eaa1600db3bd02f8df5e7b01ac1cab

3 files changed, 8 insertions, 7 deletions

diff --git a/manifest b/manifest
index cd6681b82..0daa75ee5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\ssession\sfix\sfrom\strunk.
-D 2018-03-05T21:19:57.440
+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 1d5a68043cc4d8a6e45b37e2639b148cdd7973aa75e90ec71e12d55cd95e32c0
@@ -569,7 +569,7 @@ F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2
 F src/vdbetrace.c 48e11ebe040c6b41d146abed2602e3d00d621d7ebe4eb29b0a0f1617fd3c2f6c
 F src/vtab.c 0e4885495172e1bdf54b12cce23b395ac74ef5729031f15e1bc1e3e6b360ed1a
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c 60e5c938c4858c72f0cb0c7220282d3066efa215ad5e82f3cf4c0b833fbe60dc
+F src/wal.c aa9cffc7a2bad6b826a86c8562dd4978398720ed41cb8ee7aa9d054eb8b456a0
 F src/wal.h 8de5d2d3de0956d6f6cb48c83a4012d5f227b8fe940f3a349a4b7e85ebcb492a
 F src/walker.c da987a20d40145c0a03c07d8fefcb2ed363becc7680d0500d9c79915591f5b1f
 F src/where.c 7cae47e813393d70c6d327fdf000fcb30f76b1b0b5a5b52ff6402e0c658de32c
@@ -1710,7 +1710,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 99c02aeecf47bfa5be5ce38a7ec20818ea0f9fb960b136184e1cb6f8fb8b70e5 7e70c9b86af557e86152748ddf1da467e62817b35df1da0d7d3b67941b198897
-R acb69ad1080a51e22610a417d769018c
+P 6274cf1f397d36be9e9b65b1935a776c834e4512e0e89f82c132efd4d1e8ef82 e5ce256aa1f7a8ae995b79c9da895827bee5d8d0724fc15413ff203dc9e2602d
+R 4fdec0179640fc276902d16463f8cb6d
 U drh
-Z 437589d094a82dcb6a39fdcd8a54051a
+Z bbb52f4afaed03841603241952a4da37
diff --git a/manifest.uuid b/manifest.uuid
index 1c1690f19..854da7037 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6274cf1f397d36be9e9b65b1935a776c834e4512e0e89f82c132efd4d1e8ef82
\ No newline at end of file
+6399e101d5f6b8582640e0d90783e56042eaa1600db3bd02f8df5e7b01ac1cab
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index c42bf39bc..69a89a709 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -1667,6 +1667,7 @@ static int walIteratorInit(Wal *pWal, u32 nBackfill, WalIterator **pp){
 
   if( rc!=SQLITE_OK ){
     walIteratorFree(p);
+    p = 0;
   }
   *pp = p;
   return rc;