aboutsummaryrefslogtreecommitdiff
path: root/src/select.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2020-06-29 16:30:10 +0000
committerdrh <drh@noemail.net>2020-06-29 16:30:10 +0000
commit64185e31fcd74d253d117f17c043ca954a9b417c (patch)
tree2e278c28b8cedb7f1478bffd18dc6ad80b1fb0a6 /src/select.c
parentb695bab0555648daf9f3c438de11fd1f52993c78 (diff)
downloadsqlite-64185e31fcd74d253d117f17c043ca954a9b417c.tar.gz
sqlite-64185e31fcd74d253d117f17c043ca954a9b417c.zip
Do not run resetAccumulator() after a malloc failure.
FossilOrigin-Name: 1b426603f05033bcee0331c6f664cd5ed2ebf8f5d4cde8c6673c7a699ff53bb1
Diffstat (limited to 'src/select.c')
-rw-r--r--src/select.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/select.c b/src/select.c
index 31f22664a..42474d61d 100644
--- a/src/select.c
+++ b/src/select.c
@@ -5373,7 +5373,7 @@ static void resetAccumulator(Parse *pParse, AggInfo *pAggInfo){
struct AggInfo_func *pFunc;
int nReg = pAggInfo->nFunc + pAggInfo->nColumn;
if( nReg==0 ) return;
- if( pParse->nErr ) return;
+ if( pParse->nErr || pParse->db->mallocFailed ) return;
#ifdef SQLITE_DEBUG
/* Verify that all AggInfo registers are within the range specified by
** AggInfo.mnReg..AggInfo.mxReg */