database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-16 23:02:26 +03:00
Code Activity

Add tests and fixes for handling malloc() failures related to the virtual table feature. (CVS 3285)

Browse Source 
FossilOrigin-Name: 5d1d907189ff3ca7afada83033280cf258984ac0
This commit is contained in:
danielk1977
2006-06-23 08:05:19 +00:00
parent a298e90d50
commit be71889703
13 changed files with 257 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/where.c
View File

@@ -16,7 +16,7 @@
** so is applicable. Because this module is responsible for selecting
** indices, you might also think of this module as the "query optimizer".
**
** $Id: where.c,v 1.221 2006/06/20 13:07:28 danielk1977 Exp $
** $Id: where.c,v 1.222 2006/06/23 08:05:31 danielk1977 Exp $
*/
#include "sqliteInt.h"
@@ -1125,10 +1125,16 @@ static double bestVirtualIndex(
}
sqlite3SafetyOff(pParse->db);
pTab->pVtab->pModule->xBestIndex(pTab->pVtab, pIdxInfo);
rc = sqlite3SafetyOn(pParse->db);
rc = pTab->pVtab->pModule->xBestIndex(pTab->pVtab, pIdxInfo);
if( rc!=SQLITE_OK ){
sqlite3ErrorMsg(pParse, "%s", sqlite3ErrStr(rc));
if( rc==SQLITE_NOMEM ){
sqlite3FailedMalloc();
}else {
sqlite3ErrorMsg(pParse, "%s", sqlite3ErrStr(rc));
}
sqlite3SafetyOn(pParse->db);
}else{
rc = sqlite3SafetyOn(pParse->db);
}
*(int*)&pIdxInfo->nOrderBy = nOrderBy;