diff options
author | drh <> | 2022-01-24 16:47:12 +0000 |
---|---|---|
committer | drh <> | 2022-01-24 16:47:12 +0000 |
commit | 0c7d3d399d4706db18789dbd50466e4d589e5fcd (patch) | |
tree | 8af14619211686909126dc8521403bb24562f389 /src/insert.c | |
parent | c692df2784db52587fdf2a2ae20340ad8e7fc034 (diff) | |
download | sqlite-0c7d3d399d4706db18789dbd50466e4d589e5fcd.tar.gz sqlite-0c7d3d399d4706db18789dbd50466e4d589e5fcd.zip |
Remove many redundant checks for sqlite3.mallocFailed now that any OOM should
cause Parse.nErr to be non-zero.
FossilOrigin-Name: 1f7fa46126ea33ed30e93186aff3df51068aeb4be6f79a102bfe8c4e44941d71
Diffstat (limited to 'src/insert.c')
-rw-r--r-- | src/insert.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/insert.c b/src/insert.c index 9a02ec695..fd3590cb3 100644 --- a/src/insert.c +++ b/src/insert.c @@ -715,9 +715,11 @@ void sqlite3Insert( #endif db = pParse->db; - if( pParse->nErr || db->mallocFailed ){ + assert( db->pParse==pParse ); + if( pParse->nErr ){ goto insert_cleanup; } + assert( db->mallocFailed==0 ); dest.iSDParm = 0; /* Suppress a harmless compiler warning */ /* If the Select object is really just a simple VALUES() list with a @@ -893,7 +895,9 @@ void sqlite3Insert( dest.nSdst = pTab->nCol; rc = sqlite3Select(pParse, pSelect, &dest); regFromSelect = dest.iSdst; - if( rc || db->mallocFailed || pParse->nErr ) goto insert_cleanup; + assert( db->pParse==pParse ); + if( rc || pParse->nErr ) goto insert_cleanup; + assert( db->mallocFailed==0 ); sqlite3VdbeEndCoroutine(v, regYield); sqlite3VdbeJumpHere(v, addrTop - 1); /* label B: */ assert( pSelect->pEList ); |