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

Fix a reference to freed memory that can occur following an OOM error in

Browse Source 
where.c.

FossilOrigin-Name: 929b6047391411c6f539e47afe6b63d16e352ccb
This commit is contained in:
drh
2009-11-16 22:54:50 +00:00
parent 372726336b
commit f6a82030a8
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/where.c
View File

@@ -2594,15 +2594,13 @@ static void disableTerm(WhereLevel *pLevel, WhereTerm *pTerm){
** Code an OP_Affinity opcode to apply the column affinity string zAff
** to the n registers starting at base.
**
** Buffer zAff was allocated using sqlite3DbMalloc(). It is the
** responsibility of this function to arrange for it to be eventually
** freed using sqlite3DbFree().
** This routine assumes that zAff is dynamic and makes its own copy.
*/
static void codeApplyAffinity(Parse *pParse, int base, int n, char *zAff){
Vdbe *v = pParse->pVdbe;
assert( v!=0 );
sqlite3VdbeAddOp2(v, OP_Affinity, base, n);
sqlite3VdbeChangeP4(v, -1, zAff, P4_DYNAMIC);
sqlite3VdbeChangeP4(v, -1, zAff, 0);
sqlite3ExprCacheAffinityChange(pParse, base, n);
}
@@ -3130,7 +3128,6 @@ static Bitmask codeOneLoopStart(
sqlite3ExprCacheRemove(pParse, regBase+nEq);
sqlite3ExprCode(pParse, pRight, regBase+nEq);
sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, addrNxt);
zAff = sqlite3DbStrDup(pParse->db, zAff);
if( zAff
&& sqlite3CompareAffinity(pRight, zAff[nConstraint])==SQLITE_AFF_NONE
){
@@ -3142,6 +3139,7 @@ static Bitmask codeOneLoopStart(
codeApplyAffinity(pParse, regBase, nEq+1, zAff);
nConstraint++;
}
sqlite3DbFree(pParse->db, zAff);
/* Top of the loop body */
pLevel->p2 = sqlite3VdbeCurrentAddr(v);