diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/vdbe.c | 6 | ||||
| -rw-r--r-- | src/vdbeaux.c | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/vdbe.c b/src/vdbe.c index c66680220..bb23757d6 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -2739,7 +2739,11 @@ op_column_restart: assert( pC->szRow<=65536 ); /* Maximum page size is 64KiB */ } pC->cacheStatus = p->cacheCtr; - pC->iHdrOffset = getVarint32(pC->aRow, aOffset[0]); + if( (aOffset[0] = pC->aRow[0])<0x80 ){ + pC->iHdrOffset = 1; + }else{ + pC->iHdrOffset = sqlite3GetVarint32(pC->aRow, aOffset); + } pC->nHdrParsed = 0; if( pC->szRow<aOffset[0] ){ /*OPTIMIZATION-IF-FALSE*/ diff --git a/src/vdbeaux.c b/src/vdbeaux.c index aa45cae54..8fdd85abb 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -4419,14 +4419,22 @@ int sqlite3VdbeRecordCompareWithSkip( ** two elements in the keys are equal. Fix the various stack variables so ** that this routine begins comparing at the second field. */ if( bSkip ){ - u32 s1; - idx1 = 1 + getVarint32(&aKey1[1], s1); + u32 s1 = aKey1[1]; + if( s1<0x80 ){ + idx1 = 2; + }else{ + idx1 = 1 + sqlite3GetVarint32(&aKey1[1], &s1); + } szHdr1 = aKey1[0]; d1 = szHdr1 + sqlite3VdbeSerialTypeLen(s1); i = 1; pRhs++; }else{ - idx1 = getVarint32(aKey1, szHdr1); + if( (szHdr1 = aKey1[0])<0x80 ){ + idx1 = 1; + }else{ + idx1 = sqlite3GetVarint32(aKey1, &szHdr1); + } d1 = szHdr1; i = 0; } |