Ensure that sqlite3_blob_reopen() correctly handles short rows.

Proposed fix for ticket [e6e962d6b0f06f46e].  Further testing needed.

FossilOrigin-Name: 57d8dad35c2a9ab635e954dce7f3986ae1ca8ed2

diff --git a/manifest b/manifest
index f8cd52fc5bf9ad06a8ed2c2883592ca1830df299..2325ce262566f24e1c903a2b740ee49dfaa66840 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Document\sthe\s--mmap\soption\sin\sthe\s--help\sscreen\sfor\skvtest.\s\sEnhance\skvtest\sso\nthat\snumeric\sarguments\scan\shave\ssuffixes\slike\s"K"\sor\s"M".\s\sAdd\skvtest\sto\sthe\nunix\smakefiles.
-D 2017-01-23T19:11:38.113
+C Ensure\sthat\ssqlite3_blob_reopen()\scorrectly\shandles\sshort\srows.\nProposed\sfix\sfor\sticket\s[e6e962d6b0f06f46e].\s\sFurther\stesting\sneeded.
+D 2017-01-25T04:41:34.251
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -462,7 +462,7 @@ F src/vdbe.h b0866e4191f096f1c987a84b042c3599bdf5423b
 F src/vdbeInt.h 281cb70332dc8b593b8c7afe776f3a2ba7d4255e
 F src/vdbeapi.c d6ebaa465f070eb1af8ba4e7b34583ece87bdd24
 F src/vdbeaux.c 35c9a9908174e5a26c96d15e1f98214814a39147
-F src/vdbeblob.c 2159f36d2c3e7ed24e3ebe99a9a4b462248c0665
+F src/vdbeblob.c 2b3d1ad915dbe5dc92c48759dc18fa8c697e78e5
 F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
 F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
 F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
@@ -1547,7 +1547,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4948f7e6d2a1cfce36a7aab2f5b65be07c285ac3
-R 9f530d22e2b0a16555eacd054431a10f
+P 175bda87288c7ce15b163316159f53a60822ccad
+R 344bedd0898a54c0d1255ff2528051f8
+T *branch * blob_reopen-fix
+T *sym-blob_reopen-fix *
+T -sym-trunk *
 U drh
-Z 4864426d37a32c6f04be82da7889e371
+Z ac35e85a79d80d6e1f6100309e724651

diff --git a/manifest.uuid b/manifest.uuid
index 82e31c7d74f31a679040062856e27b0588a44028..1d4e697bcddaddbccb8999dfc4f28696e5735449 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-175bda87288c7ce15b163316159f53a60822ccad
\ No newline at end of file
+57d8dad35c2a9ab635e954dce7f3986ae1ca8ed2
\ No newline at end of file

diff --git a/src/vdbeblob.c b/src/vdbeblob.c
index 1efd4c92435fe5fdcb0d6a8324aa3a2b3876924c..810f78860f1f8004386deb85538a737e5be7fa88 100644 (file)
--- a/src/vdbeblob.c
+++ b/src/vdbeblob.c
@@ -77,7 +77,9 @@ static int blobSeekToRow(Incrblob *p, sqlite3_int64 iRow, char **pzErr){
   }
   if( rc==SQLITE_ROW ){
     VdbeCursor *pC = v->apCsr[0];
-    u32 type = pC->aType[p->iCol];
+    u32 type = pC->nHdrParsed>p->iCol ? pC->aType[p->iCol] : 0;
+    testcase( pC->nHdrParsed==p->iCol );
+    testcase( pC->nHdrParsed==p->iCol+1 );
     if( type<12 ){
       zErr = sqlite3MPrintf(p->db, "cannot open value of type %s",
           type==0?"null": type==7?"real": "integer"