database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-21 09:00:59 +03:00
Code Activity

Fix memory leaks in the NGQP logic for virtual tables.

Browse Source 
FossilOrigin-Name: 3c2e83a4a2c5e85202162feeb37ef7a3911c05a3
This commit is contained in:
drh
2013-05-08 20:05:58 +00:00
parent 5346e95dda
commit c718f1c894
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/where.c
View File

@@ -5442,8 +5442,11 @@ static int whereLoopAddVirtual(
pIdxInfo = allocateIndexInfo(pParse,pWC,pSrc,pBuilder->pOrderBy);
if( pIdxInfo==0 ) return SQLITE_NOMEM;
paTerm = sqlite3DbRealloc(db, pNew->aTerm,
pIdxInfo->nConstraint*sizeof(pNew->aTerm[0]));
if( paTerm==0 ) return SQLITE_NOMEM;
(pIdxInfo->nConstraint+1)*sizeof(pNew->aTerm[0]));
if( paTerm==0 ){
sqlite3DbFree(db, pIdxInfo);
return SQLITE_NOMEM;
}
pNew->aTerm = paTerm;
pNew->prereq = 0;
pNew->iTab = iTab;
@@ -5504,7 +5507,7 @@ static int whereLoopAddVirtual(
pIdxCons = *(struct sqlite3_index_constraint**)&pIdxInfo->aConstraint;
pNew->prereq = 0;
for(i=0; i<pIdxInfo->nConstraint; i++) pNew->aTerm[i] = 0;
mxTerm = 0;
mxTerm = -1;
for(i=0; i<pIdxInfo->nConstraint; i++, pIdxCons++){
if( (iTerm = pUsage[i].argvIndex - 1)>=0 ){
j = pIdxCons->iTermOffset;
@@ -5659,7 +5662,7 @@ static int wherePathSolver(WhereInfo *pWInfo){
if( nTo<mxChoice ){
jj = nTo++;
}else{
for(jj=nTo-1; aTo[jj].rCost>=mxCost; jj--){ assert(jj>0); }
for(jj=nTo-1; aTo[jj].rCost<mxCost; jj--){ assert(jj>0); }
}
pTo = &aTo[jj];
}else{
@@ -5701,7 +5704,7 @@ static int wherePathSolver(WhereInfo *pWInfo){
}
/* TEMPORARY */
// if( nFrom==0 ){ sqlite3DbFree(db, pSpace); return SQLITE_ERROR; }
if( nFrom==0 ){ sqlite3DbFree(db, pSpace); return SQLITE_ERROR; }
assert( nFrom>0 );
/* Find the lowest cost path and load it into pWInfo->a[].pWLoop */