diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-09-07 15:10:15 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-09-07 15:10:15 +0000 |
| commit | 2195f7ec74c445404dd5d38378dadc956cf6fe60 (patch) | |
| tree | 528f29ea6e1aa1986ac01f66f35ec783dec07885 /ext/sqlite/libsqlite/src/vdbe.c | |
| parent | 49cf0eff6a9880d751c7c4be872d3612969bc995 (diff) | |
| download | php-git-2195f7ec74c445404dd5d38378dadc956cf6fe60.tar.gz | |
Upgraded sqlite2 lib to 2.8.16
Diffstat (limited to 'ext/sqlite/libsqlite/src/vdbe.c')
| -rw-r--r-- | ext/sqlite/libsqlite/src/vdbe.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/sqlite/libsqlite/src/vdbe.c b/ext/sqlite/libsqlite/src/vdbe.c index 09332560df..7ea05c9acd 100644 --- a/ext/sqlite/libsqlite/src/vdbe.c +++ b/ext/sqlite/libsqlite/src/vdbe.c @@ -4545,6 +4545,10 @@ case OP_AggGet: { pTos->flags &= ~(MEM_Dyn|MEM_Static|MEM_Short); pTos->flags |= MEM_Ephem; } + if( pTos->flags & MEM_AggCtx ){ + Release(pTos); + pTos->flags = MEM_Null; + } break; } @@ -4695,8 +4699,9 @@ case OP_SetNext: { break; } }else{ - assert( pSet->prev ); - pSet->prev = sqliteHashNext(pSet->prev); + if( pSet->prev ){ + pSet->prev = sqliteHashNext(pSet->prev); + } if( pSet->prev==0 ){ break; }else{ |