database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

Fix a memory leak introduced with #4687. (CVS 4688)

Browse Source 
FossilOrigin-Name: 2b98b0fca82e285ae6b38384587aafa27985fa34
This commit is contained in:
danielk1977
2008-01-05 18:44:29 +00:00
parent a9d1ccb9b0
commit dba0137e1e
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/select.c
View File

@@ -12,7 +12,7 @@
** This file contains C code routines that are called by the parser
** to handle SELECT statements in SQLite.
**
** $Id: select.c,v 1.387 2008/01/05 17:39:30 danielk1977 Exp $
** $Id: select.c,v 1.388 2008/01/05 18:44:29 danielk1977 Exp $
*/
#include "sqliteInt.h"
@@ -3638,6 +3638,7 @@ int sqlite3Select(
} /* endif pGroupBy */
else {
ExprList *pMinMax = 0;
ExprList *pDel = 0;
u8 flag;
flag = minMaxQuery(pParse, p);
@@ -3647,6 +3648,7 @@ int sqlite3Select(
pMinMax->a[0].sortOrder = ((flag==ORDERBY_MIN)?0:1);
pMinMax->a[0].pExpr->op = TK_COLUMN;
}
pDel = pMinMax;
}
/* This case runs if the aggregate has no GROUP BY clause. The
@@ -3655,7 +3657,10 @@ int sqlite3Select(
*/
resetAccumulator(pParse, &sAggInfo);
pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, &pMinMax, flag);
if( pWInfo==0 ) goto select_end;
if( pWInfo==0 ){
sqlite3ExprListDelete(pMinMax);
goto select_end;
}
updateAccumulator(pParse, &sAggInfo);
if( !pMinMax && flag ){
sqlite3VdbeAddOp2(v, OP_Goto, 0, pWInfo->iBreak);
@@ -3670,7 +3675,7 @@ int sqlite3Select(
selectInnerLoop(pParse, p, p->pEList, 0, 0, 0, -1,
pDest, addrEnd, addrEnd, aff);
sqlite3ExprListDelete(pMinMax);
sqlite3ExprListDelete(pDel);
}
sqlite3VdbeResolveLabel(v, addrEnd);