aboutsummaryrefslogtreecommitdiff
path: root/src/backend/access/gist/gistscan.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2011-09-16 04:28:15 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2011-09-16 04:28:15 -0400
commitca00f191576183b77ccd60fb29dde86fd96c4b45 (patch)
treee4dae1ca047d957f3b5f683bff36d371d4291aa4 /src/backend/access/gist/gistscan.c
parent33e111f2258af78f8816dae2eef49c371b94da77 (diff)
downloadpostgresql-ca00f191576183b77ccd60fb29dde86fd96c4b45.tar.gz
postgresql-ca00f191576183b77ccd60fb29dde86fd96c4b45.zip
gistendscan() forgot to free so->giststate.
This oversight led to a massive memory leak --- upwards of 10KB per tuple --- during creation-time verification of an exclusion constraint based on a GIST index. In most other scenarios it'd just be a leak of 10KB that would be recovered at end of query, so not too significant; though perhaps the leak would be noticeable in a situation where a GIST index was being used in a nestloop inner indexscan. In any case, it's a real leak of long standing, so patch all supported branches. Per report from Harald Fuchs.
Diffstat (limited to 'src/backend/access/gist/gistscan.c')
-rw-r--r--src/backend/access/gist/gistscan.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index aeb1a8282c8..27b92e4a362 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -226,14 +226,17 @@ gistendscan(PG_FUNCTION_ARGS)
gistfreestack(so->stack);
gistfreestack(so->markstk);
if (so->giststate != NULL)
+ {
freeGISTstate(so->giststate);
+ pfree(so->giststate);
+ }
/* drop pins on buffers -- we aren't holding any locks */
if (BufferIsValid(so->curbuf))
ReleaseBuffer(so->curbuf);
if (BufferIsValid(so->markbuf))
ReleaseBuffer(so->markbuf);
MemoryContextDelete(so->tempCxt);
- pfree(scan->opaque);
+ pfree(so);
}
PG_RETURN_VOID();