Fix a problem in the "showdb" utility that prevents it from correctly

decoding cells with no content beyond the record header.

FossilOrigin-Name: eb7680a1c047b2a33d6a0c9733fafaee11272377c627af10bbd541b6b7ed952b

diff --git a/manifest b/manifest
index e9aad067d4f82393100e4ed778db6b6b9c06da86..e0d90caf8e2c8bff630bdb22f26ef34d1b822e07 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scrash\sthat\scould\sfollow\san\sOOM\scondition\sin\sthe\sinstr()\sSQL\sfunction.
-D 2017-03-16T12:11:07.597
+C Fix\sa\sproblem\sin\sthe\s"showdb"\sutility\sthat\sprevents\sit\sfrom\scorrectly\ndecoding\scells\swith\sno\scontent\sbeyond\sthe\srecord\sheader.
+D 2017-03-16T13:14:03.665
 F Makefile.in 9605f4c49eace601d5c12c85dd6e037cc613a6d823e857614ba26b42f1285db0
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a
@@ -1518,7 +1518,7 @@ F tool/replace.tcl 60f91e8dd06ab81f74d213ecbd9c9945f32ac048
 F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
 F tool/run-speed-test.sh f95d19fd669b68c4c38b6b475242841d47c66076
-F tool/showdb.c c695a5d5c8110640e0d9fadf5e254da90c79c36e
+F tool/showdb.c e6bc9dba233bf1b57ca0a525a2bba762db4e223de84990739db3f09c46151b1e
 F tool/showjournal.c 5bad7ae8784a43d2b270d953060423b8bd480818
 F tool/showlocks.c 9920bcc64f58378ff1118caead34147201f48c68
 F tool/showstat4.c b14159aa062f661b394ba37b6b7b94bfb8012ab9
@@ -1565,7 +1565,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 029bc5d224bcbdcca2307710539b133c39e2a27b971c28b294a1f517b80cb418
-R e125f692ae2203427c312740eb052007
-U dan
-Z 43eef8b6f1a791e34b2b986222f188cc
+P 6e59e903e4e956617bddef0b94e5cae02d724ac8145940b57ab5b0f628759736
+R e2b1419a7c2797d673769ba867cc93d0
+U drh
+Z 979d31964af3fe7c6823fdbe1eb4300f

diff --git a/manifest.uuid b/manifest.uuid
index 808a7701e3bc1bef4242d6811e118f9d543eccfe..8782dfa202ebd5ca8b44143ea6d5e163c3eae5c6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6e59e903e4e956617bddef0b94e5cae02d724ac8145940b57ab5b0f628759736
\ No newline at end of file
+eb7680a1c047b2a33d6a0c9733fafaee11272377c627af10bbd541b6b7ed952b
\ No newline at end of file

diff --git a/tool/showdb.c b/tool/showdb.c
index d51a2fd83db4b1d9fca21fd55a34df0f357db5e9..ba7a362258dffc12e852656643ea8e48c64f8b40 100644 (file)
--- a/tool/showdb.c
+++ b/tool/showdb.c
@@ -535,7 +535,7 @@ static void decodeCell(
     j = i;
     nCol = 0;
     k = nHdr;
-    while( x+j<end && j<nHdr ){
+    while( x+j<=end && j<nHdr ){
        const char *zTypeName;
        int sz = 0;
        char zNm[30];