aboutsummaryrefslogtreecommitdiff
path: root/src/malloc.c
diff options
context:
space:
mode:
authorstephan <stephan@noemail.net>2022-07-20 10:09:19 +0000
committerstephan <stephan@noemail.net>2022-07-20 10:09:19 +0000
commit4b5919e2ced99d8df9d0795ca741408cfee6c993 (patch)
treee624334835b255a5a13ac89ddc576b9347b1e760 /src/malloc.c
parentbc7180cdb362b0069fed60b0c207533122cc5ec2 (diff)
parenta5cc692422afa7fad710a4459139d7ba00346b21 (diff)
downloadsqlite-4b5919e2ced99d8df9d0795ca741408cfee6c993.tar.gz
sqlite-4b5919e2ced99d8df9d0795ca741408cfee6c993.zip
Merged in trunk.
FossilOrigin-Name: d662796c658997be13fdc3b77ad97101b9513da53fd0b824d7a4050cac3f7eba
Diffstat (limited to 'src/malloc.c')
-rw-r--r--src/malloc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/malloc.c b/src/malloc.c
index cfda60a0b..c508bf752 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -776,8 +776,13 @@ void *sqlite3OomFault(sqlite3 *db){
}
DisableLookaside;
if( db->pParse ){
+ Parse *pParse;
sqlite3ErrorMsg(db->pParse, "out of memory");
db->pParse->rc = SQLITE_NOMEM_BKPT;
+ for(pParse=db->pParse->pOuterParse; pParse; pParse = pParse->pOuterParse){
+ pParse->nErr++;
+ pParse->rc = SQLITE_NOMEM;
+ }
}
}
return 0;