diff options
author | Stanislav Malyshev <stas@php.net> | 2005-01-03 11:28:12 +0000 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2005-01-03 11:28:12 +0000 |
commit | ed8eb783499e5378cd4a32985662437557ae29f5 (patch) | |
tree | 923ac9bf6c2a5681c6be899664278a7d48fe15ad | |
parent | fff93cdb7f3e6e348ed88d0f4044e133e823c195 (diff) | |
download | php-git-ed8eb783499e5378cd4a32985662437557ae29f5.tar.gz |
merge patch from http://www.sqlite.org/cvstrac/chngview?cn=1953
bug led to PHP exiting on queries with unknown columns
-rw-r--r-- | ext/sqlite/libsqlite/src/auth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/sqlite/libsqlite/src/auth.c b/ext/sqlite/libsqlite/src/auth.c index 3f861c710d..040488077c 100644 --- a/ext/sqlite/libsqlite/src/auth.c +++ b/ext/sqlite/libsqlite/src/auth.c @@ -111,6 +111,7 @@ void sqliteAuthRead( const char *zCol; /* Name of the column of the table */ int iSrc; /* Index in pTabList->a[] of table being read */ const char *zDBase; /* Name of database being accessed */ + TriggerStack *pStack; /* The stack of current triggers */ if( db->xAuth==0 ) return; assert( pExpr->op==TK_COLUMN ); @@ -119,15 +120,14 @@ void sqliteAuthRead( } if( iSrc>=0 && iSrc<pTabList->nSrc ){ pTab = pTabList->a[iSrc].pTab; - }else{ + }else if( (pStack = pParse->trigStack)!=0 ){ /* This must be an attempt to read the NEW or OLD pseudo-tables ** of a trigger. */ - TriggerStack *pStack; /* The stack of current triggers */ - pStack = pParse->trigStack; - assert( pStack!=0 ); assert( pExpr->iTable==pStack->newIdx || pExpr->iTable==pStack->oldIdx ); pTab = pStack->pTab; + }else{ + return; } if( pTab==0 ) return; if( pExpr->iColumn>=0 ){ |