Prevent a possible crash when trying to recover using a carefully corrupted \

and truncated rollback journal.  (Test case in TH3)

FossilOrigin-Name: 02828d717e2d97b1f59e9279cea9c06eed4accd4e262606bd90d060449c5a1a3

diff --git a/manifest b/manifest
index 0078fd0802844bfba82d14c9f65c6d6426ed1249..c758b51493d9c18ef7d02ef6271b5945cfb13172 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\s"PRAGMA\sintegrity_check"\sto\sdetect\sinconsistencies\sbetween\sa\ssingle\nrecord's\sheader\sand\sbody.
-D 2017-09-05T20:16:19.056
+C Prevent\sa\spossible\scrash\swhen\strying\sto\srecover\susing\sa\scarefully\scorrupted\s\\\nand\struncated\srollback\sjournal.\s\s(Test\scase\sin\sTH3)
+D 2017-09-07T09:56:37.081
 F Makefile.in c644bbe8ebe4aae82ad6783eae6b6beea4c727b99ff97568b847ced5e2ac7afb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6a7a74bf60ad395098c0bd175ab054cd65ef85d7f034198d52bcc4d9e5fb4c6b
@@ -444,7 +444,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c 489aa972ccc34f7b4770b891694b32101c59ddd4be4ef0ddd9a4da58c145c1a6
 F src/os_win.c 964165b66cde03abc72fe948198b01be608436894732eadb94c8720d2467f223
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c 3936b32a0a45f1b80462b38ba1ed0556e62843554a089ab9c4be1a35c97f23bc
+F src/pager.c 967168bba88d2dc790ed9618bd4ba7bfe475b67b521ef6da305a6425c592928f
 F src/pager.h 581698f2177e8bd4008fe4760898ce20b6133d1df22139b9101b5155f900df7a
 F src/parse.y 52ef3cecd0934e9da4a45b585883a03243ad615d338ad94f44501a05891dcdfa
 F src/pcache.c 4bada070456980c3c1f16d58ec2e64e389ad77b935e3d77e0c96e7bbd397289c
@@ -1652,7 +1652,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 868cd1960015dc1bf003f911dcc417a94540d1948617ea1838a48b5cff59afda
-R 83e466a9200a37ab621e4f303813e8d5
-U dan
-Z 1263b9376b837ff6f4f4c7ebd74970c0
+P 9e393a0edf1a578ddecc16a72fe3c54b75c2a650d507bcbc37c9724fbede1494
+R f5c3e71f60efc1950a71b5fb4b758fc2
+U drh
+Z 445858944243f3b3fef9b85f002c6409

diff --git a/manifest.uuid b/manifest.uuid
index fd33be3a9a16e1ed989ca1b3dd99907ce82a6ca6..f41cbd8d461c5ee2a72a292bae2da9b988e5d888 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9e393a0edf1a578ddecc16a72fe3c54b75c2a650d507bcbc37c9724fbede1494
\ No newline at end of file
+02828d717e2d97b1f59e9279cea9c06eed4accd4e262606bd90d060449c5a1a3
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index b3ec03bd952a07f0a674cf81424b83ffc4f78efa..4f3f75b6e792d1113c7b9f026443fba550ddfa6a 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -1315,6 +1315,7 @@ static int readMasterJournal(sqlite3_file *pJrnl, char *zMaster, u32 nMaster){
    || szJ<16
    || SQLITE_OK!=(rc = read32bits(pJrnl, szJ-16, &len))
    || len>=nMaster 
+   || len>szJ-16
    || len==0 
    || SQLITE_OK!=(rc = read32bits(pJrnl, szJ-12, &cksum))
    || SQLITE_OK!=(rc = sqlite3OsRead(pJrnl, aMagic, 8, szJ-8))