diff options
| author | drh <drh@noemail.net> | 2015-05-05 17:12:27 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-05-05 17:12:27 +0000 |
| commit | d689fd3a92428042a0784f7d8eb0fecda8921af8 (patch) | |
| tree | 4d08293a03c01784935430d2c1caed449ad48bb3 /src/tokenize.c | |
| parent | b9db90995254891621c116039cef50b5c3606db1 (diff) | |
| parent | 0a96931b76e9b68e73d312bcc479d54b818a26cb (diff) | |
| download | sqlite-d689fd3a92428042a0784f7d8eb0fecda8921af8.tar.gz sqlite-d689fd3a92428042a0784f7d8eb0fecda8921af8.zip | |
Merge all trunk enhancements and fixes into the sessions branch.
FossilOrigin-Name: de7083cfe2bb00b689bec6bcc75e994f564ceda6
Diffstat (limited to 'src/tokenize.c')
| -rw-r--r-- | src/tokenize.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tokenize.c b/src/tokenize.c index 076acb020..78baee3e1 100644 --- a/src/tokenize.c +++ b/src/tokenize.c @@ -450,12 +450,14 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ } abort_parse: assert( nErr==0 ); - if( zSql[i]==0 && pParse->rc==SQLITE_OK ){ + if( zSql[i]==0 && pParse->rc==SQLITE_OK && db->mallocFailed==0 ){ if( lastTokenParsed!=TK_SEMI ){ sqlite3Parser(pEngine, TK_SEMI, pParse->sLastToken, pParse); pParse->zTail = &zSql[i]; } - sqlite3Parser(pEngine, 0, pParse->sLastToken, pParse); + if( pParse->rc==SQLITE_OK && db->mallocFailed==0 ){ + sqlite3Parser(pEngine, 0, pParse->sLastToken, pParse); + } } #ifdef YYTRACKMAXSTACKDEPTH sqlite3_mutex_enter(sqlite3MallocMutex()); |