128 lines
4.7 KiB
Diff
128 lines
4.7 KiB
Diff
Index: src/expr.c
|
|
==================================================================
|
|
--- /src/expr.c
|
|
+++ /435726src/expr.c
|
|
@@ -7013,11 +7013,13 @@
|
|
AggInfo *pAggInfo, /* The AggInfo object to search and/or modify */
|
|
Expr *pExpr /* Expr describing the column to find or insert */
|
|
){
|
|
struct AggInfo_col *pCol;
|
|
int k;
|
|
+ int mxTerm = pParse->db->aLimit[SQLITE_LIMIT_COLUMN];
|
|
|
|
+ assert( mxTerm <= SMXV(i16) );
|
|
assert( pAggInfo->iFirstReg==0 );
|
|
pCol = pAggInfo->aCol;
|
|
for(k=0; k<pAggInfo->nColumn; k++, pCol++){
|
|
if( pCol->pCExpr==pExpr ) return;
|
|
if( pCol->iTable==pExpr->iTable
|
|
@@ -7030,10 +7032,14 @@
|
|
k = addAggInfoColumn(pParse->db, pAggInfo);
|
|
if( k<0 ){
|
|
/* OOM on resize */
|
|
assert( pParse->db->mallocFailed );
|
|
return;
|
|
+ }
|
|
+ if( k>mxTerm ){
|
|
+ sqlite3ErrorMsg(pParse, "more than %d aggregate terms", mxTerm);
|
|
+ k = mxTerm;
|
|
}
|
|
pCol = &pAggInfo->aCol[k];
|
|
assert( ExprUseYTab(pExpr) );
|
|
pCol->pTab = pExpr->y.pTab;
|
|
pCol->iTable = pExpr->iTable;
|
|
@@ -7064,10 +7070,11 @@
|
|
assert( pExpr->pAggInfo==0 || pExpr->pAggInfo==pAggInfo );
|
|
pExpr->pAggInfo = pAggInfo;
|
|
if( pExpr->op==TK_COLUMN ){
|
|
pExpr->op = TK_AGG_COLUMN;
|
|
}
|
|
+ assert( k <= SMXV(pExpr->iAgg) );
|
|
pExpr->iAgg = (i16)k;
|
|
}
|
|
|
|
/*
|
|
** This is the xExprCallback for a tree walker. It is used to
|
|
@@ -7148,17 +7155,23 @@
|
|
){
|
|
/* Check to see if pExpr is a duplicate of another aggregate
|
|
** function that is already in the pAggInfo structure
|
|
*/
|
|
struct AggInfo_func *pItem = pAggInfo->aFunc;
|
|
+ int mxTerm = pParse->db->aLimit[SQLITE_LIMIT_COLUMN];
|
|
+ assert( mxTerm <= SMXV(i16) );
|
|
for(i=0; i<pAggInfo->nFunc; i++, pItem++){
|
|
if( NEVER(pItem->pFExpr==pExpr) ) break;
|
|
if( sqlite3ExprCompare(0, pItem->pFExpr, pExpr, -1)==0 ){
|
|
break;
|
|
}
|
|
}
|
|
- if( i>=pAggInfo->nFunc ){
|
|
+ if( i>mxTerm ){
|
|
+ sqlite3ErrorMsg(pParse, "more than %d aggregate terms", mxTerm);
|
|
+ i = mxTerm;
|
|
+ assert( i<pAggInfo->nFunc );
|
|
+ }else if( i>=pAggInfo->nFunc ){
|
|
/* pExpr is original. Make a new entry in pAggInfo->aFunc[]
|
|
*/
|
|
u8 enc = ENC(pParse->db);
|
|
i = addAggInfoFunc(pParse->db, pAggInfo);
|
|
if( i>=0 ){
|
|
@@ -7208,10 +7221,11 @@
|
|
}
|
|
/* Make pExpr point to the appropriate pAggInfo->aFunc[] entry
|
|
*/
|
|
assert( !ExprHasProperty(pExpr, EP_TokenOnly|EP_Reduced) );
|
|
ExprSetVVAProperty(pExpr, EP_NoReduce);
|
|
+ assert( i <= SMXV(pExpr->iAgg) );
|
|
pExpr->iAgg = (i16)i;
|
|
pExpr->pAggInfo = pAggInfo;
|
|
return WRC_Prune;
|
|
}else{
|
|
return WRC_Continue;
|
|
|
|
---
|
|
src/sqliteInt.h | 14 +++++++++++---
|
|
1 file changed, 11 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
|
|
index ec126b0..29e2a2d 100644
|
|
--- a/src/sqliteInt.h
|
|
+++ b/src/sqliteInt.h
|
|
@@ -1007,6 +1007,14 @@ typedef INT16_TYPE LogEst;
|
|
#define LARGEST_UINT64 (0xffffffff|(((u64)0xffffffff)<<32))
|
|
#define SMALLEST_INT64 (((i64)-1) - LARGEST_INT64)
|
|
|
|
+/*
|
|
+** Macro SMXV(n) return the maximum value that can be held in variable n,
|
|
+** assuming n is a signed integer type. UMXV(n) is similar for unsigned
|
|
+** integer types.
|
|
+*/
|
|
+#define SMXV(n) ((((i64)1)<<(sizeof(n)*8-1))-1)
|
|
+#define UMXV(n) ((((i64)1)<<(sizeof(n)*8))-1)
|
|
+
|
|
/*
|
|
** Round up a number to the next larger multiple of 8. This is used
|
|
** to force 8-byte alignment on 64-bit architectures.
|
|
@@ -2871,7 +2879,7 @@ struct AggInfo {
|
|
** from source tables rather than from accumulators */
|
|
u8 useSortingIdx; /* In direct mode, reference the sorting index rather
|
|
** than the source table */
|
|
- u16 nSortingColumn; /* Number of columns in the sorting index */
|
|
+ u32 nSortingColumn; /* Number of columns in the sorting index */
|
|
int sortingIdx; /* Cursor number of the sorting index */
|
|
int sortingIdxPTab; /* Cursor number of pseudo-table */
|
|
int iFirstReg; /* First register in range for aCol[] and aFunc[] */
|
|
@@ -2880,8 +2888,8 @@ struct AggInfo {
|
|
Table *pTab; /* Source table */
|
|
Expr *pCExpr; /* The original expression */
|
|
int iTable; /* Cursor number of the source table */
|
|
- i16 iColumn; /* Column number within the source table */
|
|
- i16 iSorterColumn; /* Column number in the sorting index */
|
|
+ int iColumn; /* Column number within the source table */
|
|
+ int iSorterColumn; /* Column number in the sorting index */
|
|
} *aCol;
|
|
int nColumn; /* Number of used entries in aCol[] */
|
|
int nAccumulator; /* Number of columns that show through to the output.
|
|
--
|
|
2.50.0
|