diff options
| author | drh <drh@noemail.net> | 2016-02-05 01:55:27 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-02-05 01:55:27 +0000 |
| commit | 4a642b60607e55a2c25f663b472af3609c76b214 (patch) | |
| tree | d4af5d6c69d8cde0c32bfcc7a427eb34c2815080 /src/attach.c | |
| parent | e514f651d0fb5364e6495b9d6c4dd80ca51a227f (diff) | |
| download | sqlite-4a642b60607e55a2c25f663b472af3609c76b214.tar.gz sqlite-4a642b60607e55a2c25f663b472af3609c76b214.zip | |
Improvements to the way that OOM errors are processed.
FossilOrigin-Name: c3ef03478a5788c855b3aef385d43ae7f494f440
Diffstat (limited to 'src/attach.c')
| -rw-r--r-- | src/attach.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/attach.c b/src/attach.c index 12d3ac3ff..e167951f6 100644 --- a/src/attach.c +++ b/src/attach.c @@ -127,7 +127,7 @@ static void attachFunc( flags = db->openFlags; rc = sqlite3ParseUri(db->pVfs->zName, zFile, &flags, &pVfs, &zPath, &zErr); if( rc!=SQLITE_OK ){ - if( rc==SQLITE_NOMEM ) db->mallocFailed = 1; + if( rc==SQLITE_NOMEM ) sqlite3OomFault(db); sqlite3_result_error(context, zErr, -1); sqlite3_free(zErr); return; @@ -230,7 +230,7 @@ static void attachFunc( sqlite3ResetAllSchemasOfConnection(db); db->nDb = iDb; if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){ - db->mallocFailed = 1; + sqlite3OomFault(db); sqlite3DbFree(db, zErrDyn); zErrDyn = sqlite3MPrintf(db, "out of memory"); }else if( zErrDyn==0 ){ |