external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Columnar: fix use-after-free. (#4906) 

Co-authored-by: Jeff Davis <jefdavi@microsoft.com>
pull/4859/head
jeff-davis 2021-04-15 01:00:00 -07:00 committed by GitHub
parent 987137ef97
commit 9ed56928d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/columnar/columnar_reader.c
View File

@ -211,7 +211,6 @@ ColumnarReadNextRow(ColumnarReadState *readState, Datum *columnValues, bool *col
if (!ReadStripeNextRow(readState->stripeReadState, columnValues, columnNulls)) if (!ReadStripeNextRow(readState->stripeReadState, columnValues, columnNulls))
{ {
EndStripeRead(readState->stripeReadState);
AdvanceStripeRead(readState); AdvanceStripeRead(readState);
continue; continue;
} }
@ -326,6 +325,8 @@ AdvanceStripeRead(ColumnarReadState *readState)
{ {
readState->chunkGroupsFiltered += readState->chunkGroupsFiltered +=
readState->stripeReadState->chunkGroupsFiltered; readState->stripeReadState->chunkGroupsFiltered;
EndStripeRead(readState->stripeReadState);
readState->currentStripe++; readState->currentStripe++;
readState->stripeReadState = NULL; readState->stripeReadState = NULL;
MemoryContextReset(readState->stripeReadContext); MemoryContextReset(readState->stripeReadContext);