database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Merge changes for 3.12.0.

Browse Source 
FossilOrigin-Name: ed22eb653f2809446ace6a27e7ea3926ac6db30c
This commit is contained in:
drh
2016-03-29 10:19:29 +00:00
parent 565d64014b 10df23fe4f
commit 799b8372d1
12 changed files with 68 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vdbe.c
View File

@@ -2534,7 +2534,6 @@ case OP_Column: {
}while( i<=p2 && zHdr<zEndHdr );
pC->nHdrParsed = i;
pC->iHdrOffset = (u32)(zHdr - zData);
if( pC->aRow==0 ) sqlite3VdbeMemRelease(&sMem);
/* The record is corrupt if any of the following are true:
** (1) the bytes of the header extend past the declared header size
@@ -2544,9 +2543,12 @@ case OP_Column: {
if( (zHdr>=zEndHdr && (zHdr>zEndHdr || offset64!=pC->payloadSize))
|| (offset64 > pC->payloadSize)
){
if( pC->aRow==0 ) sqlite3VdbeMemRelease(&sMem);
rc = SQLITE_CORRUPT_BKPT;
goto abort_due_to_error;
}
if( pC->aRow==0 ) sqlite3VdbeMemRelease(&sMem);
}else{
t = 0;
}