diff options
Diffstat (limited to 'src/backend/access/gin/ginscan.c')
| -rw-r--r-- | src/backend/access/gin/ginscan.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/backend/access/gin/ginscan.c b/src/backend/access/gin/ginscan.c index 7ab795ce0d6..b3a2de1edd4 100644 --- a/src/backend/access/gin/ginscan.c +++ b/src/backend/access/gin/ginscan.c @@ -163,6 +163,10 @@ ginFillScanKey(GinScanOpaque so, OffsetNumber attnum, key->curItemMatches = false; key->recheckCurItem = false; key->isFinished = false; + key->nrequired = 0; + key->nadditional = 0; + key->requiredEntries = NULL; + key->additionalEntries = NULL; ginInitConsistentFunction(ginstate, key); @@ -223,8 +227,8 @@ ginFillScanKey(GinScanOpaque so, OffsetNumber attnum, } } -static void -freeScanKeys(GinScanOpaque so) +void +ginFreeScanKeys(GinScanOpaque so) { uint32 i; @@ -237,6 +241,10 @@ freeScanKeys(GinScanOpaque so) pfree(key->scanEntry); pfree(key->entryRes); + if (key->requiredEntries) + pfree(key->requiredEntries); + if (key->additionalEntries) + pfree(key->additionalEntries); } pfree(so->keys); @@ -416,7 +424,7 @@ ginrescan(PG_FUNCTION_ARGS) /* remaining arguments are ignored */ GinScanOpaque so = (GinScanOpaque) scan->opaque; - freeScanKeys(so); + ginFreeScanKeys(so); if (scankey && scan->numberOfKeys > 0) { @@ -434,7 +442,7 @@ ginendscan(PG_FUNCTION_ARGS) IndexScanDesc scan = (IndexScanDesc) PG_GETARG_POINTER(0); GinScanOpaque so = (GinScanOpaque) scan->opaque; - freeScanKeys(so); + ginFreeScanKeys(so); MemoryContextDelete(so->tempCtx); |