mirror of https://github.com/sqlite/sqlite
Ensure that sqlite3_blob_reopen() correctly handles short rows.
Fix for ticket [e6e962d6b0f06f46e]. FossilOrigin-Name: 8cd1a4451cce1fe28f462800e2be1dee1735c0d0
This commit is contained in:
commit
7888d14caa
13
manifest
13
manifest
|
@ -1,5 +1,5 @@
|
|||
C Fix\sSQLITEINT_H\smacro\susage\sin\stwo\sextensions.
|
||||
D 2017-01-25T13:54:27.195
|
||||
C Ensure\sthat\ssqlite3_blob_reopen()\scorrectly\shandles\sshort\srows.\s\nFix\sfor\sticket\s[e6e962d6b0f06f46e].
|
||||
D 2017-01-25T14:38:19.847
|
||||
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,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
|||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P 175bda87288c7ce15b163316159f53a60822ccad
|
||||
R a9fb164433cc898aa04fd742715e395e
|
||||
P 0803390c152141c9ab4e7a28406b2a5d72a5c2fa 57d8dad35c2a9ab635e954dce7f3986ae1ca8ed2
|
||||
R d15a5cee6a51c7118a4d78b7d0cbd2de
|
||||
T +closed 57d8dad35c2a9ab635e954dce7f3986ae1ca8ed2
|
||||
U drh
|
||||
Z 35bb9e1641d0b89bf56f9577622d86ef
|
||||
Z f9af43b146da8d8246d0b97014ae0d3a
|
||||
|
|
|
@ -1 +1 @@
|
|||
0803390c152141c9ab4e7a28406b2a5d72a5c2fa
|
||||
8cd1a4451cce1fe28f462800e2be1dee1735c0d0
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue