Fix a segfault that can occur following an OOM error.

FossilOrigin-Name: 7fdd378d54754a3ffdc01c6c0a66cf6d5899a495
This commit is contained in:
dan 2014-03-03 14:20:30 +00:00
parent f21fa489b1
commit fbf0f0e1f6
3 changed files with 9 additions and 10 deletions

View File

@ -1,5 +1,5 @@
C Change\sthe\sMEM_Dyn\sflag\sso\sthat\sit\smeans\sthat\sMem.xDel\sexists\sand\smust\s\nbe\sused\sto\sfree\sthe\sstring\sor\sblob.\sAdd\stighter\sinvariant\schecks\son\sMem.
D 2014-03-03T00:12:39.825
C Fix\sa\ssegfault\sthat\scan\soccur\sfollowing\san\sOOM\serror.
D 2014-03-03T14:20:30.542
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -290,7 +290,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
F src/where.c 6042e1a377cf7dc72c10493269ed75e276275cd8
F src/where.c e4b57d81d2a5fece518c1419f047f0803483f90c
F src/whereInt.h 921f935af8b684ffb49705610bda7284db1db138
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@ -1152,8 +1152,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
P e6ecf7337658624d664e1e71ba3fc527fd6578c1 44e1c33767cae3bf2cbd2238831fe67197009b43
R 0950c7cf1a1151e6071aa7a5599d1f4e
T +closed 44e1c33767cae3bf2cbd2238831fe67197009b43
U drh
Z 4d8fd5c0a86772bcec65a15ca628db9f
P e3f6c61e0333d4d237dcd2ba2e404f0a91ee5069
R eaec45cec313455580b422d7721ccfeb
U dan
Z 0f4ad0e1bfa9fac79dc39c1726a86e9b

View File

@ -1 +1 @@
e3f6c61e0333d4d237dcd2ba2e404f0a91ee5069
7fdd378d54754a3ffdc01c6c0a66cf6d5899a495

View File

@ -5870,7 +5870,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
** the co-routine into OP_SCopy of result contained in a register.
** OP_Rowid becomes OP_Null.
*/
if( pTabItem->viaCoroutine ){
if( pTabItem->viaCoroutine && !db->mallocFailed ){
last = sqlite3VdbeCurrentAddr(v);
k = pLevel->addrBody;
pOp = sqlite3VdbeGetOp(v, k);