diff options
| author | drh <drh@noemail.net> | 2008-12-10 19:26:22 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2008-12-10 19:26:22 +0000 |
| commit | ea6788322ed9cb2aee581ed7b2b1befaa45de723 (patch) | |
| tree | 65d847abfea18be171501bb18f06fa71a44b2da2 /src/resolve.c | |
| parent | b27b7f5d3b5d9d249b9abb258ac0e6cb54b78fdd (diff) | |
| download | sqlite-ea6788322ed9cb2aee581ed7b2b1befaa45de723.tar.gz sqlite-ea6788322ed9cb2aee581ed7b2b1befaa45de723.zip | |
Never use strlen(). Use our own internal sqlite3Strlen30() which is
guaranteed to never overflow an integer. Additional explicit casts to
avoid nuisance warning messages. (CVS 6007)
FossilOrigin-Name: c872d554930ecf221ac2be5f886d5d67bb35288c
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/resolve.c b/src/resolve.c index 33b0335b5..d6f58fc70 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -14,7 +14,7 @@ ** resolve all identifiers by associating them with a particular ** table and column. ** -** $Id: resolve.c,v 1.14 2008/12/10 18:03:46 drh Exp $ +** $Id: resolve.c,v 1.15 2008/12/10 19:26:24 drh Exp $ */ #include "sqliteInt.h" #include <stdlib.h> @@ -69,7 +69,7 @@ static void resolveAlias( pDup = sqlite3PExpr(pParse, TK_AS, pDup, 0, 0); if( pDup==0 ) return; if( pEList->a[iCol].iAlias==0 ){ - pEList->a[iCol].iAlias = ++pParse->nAlias; + pEList->a[iCol].iAlias = (u16)(++pParse->nAlias); } pDup->iTable = pEList->a[iCol].iAlias; } @@ -483,7 +483,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ int nId; /* Number of characters in function name */ const char *zId; /* The function name. */ FuncDef *pDef; /* Information about the function */ - int enc = ENC(pParse->db); /* The database encoding */ + u8 enc = ENC(pParse->db); /* The database encoding */ zId = (char*)pExpr->token.z; nId = pExpr->token.n; @@ -756,7 +756,7 @@ static int resolveCompoundOrderBy( pE->pColl = pColl; pE->flags |= EP_IntValue | flags; pE->iTable = iCol; - pItem->iCol = iCol; + pItem->iCol = (u16)iCol; pItem->done = 1; }else{ moreToDo = 1; @@ -860,7 +860,7 @@ static int resolveOrderGroupBy( ** a copy of the iCol-th result-set column. The subsequent call to ** sqlite3ResolveOrderGroupBy() will convert the expression to a ** copy of the iCol-th result-set expression. */ - pItem->iCol = iCol; + pItem->iCol = (u16)iCol; continue; } if( sqlite3ExprIsInteger(pE, &iCol) ){ @@ -871,7 +871,7 @@ static int resolveOrderGroupBy( resolveOutOfRangeError(pParse, zType, i+1, nResult); return 1; } - pItem->iCol = iCol; + pItem->iCol = (u16)iCol; continue; } |