Commit30584cd

committed

Fix small query-lifespan memory leak introduced by 8.4 change in index AM API

for bitmap index scans. Per report and test case from Kevin Grittner.

1 parent8fc4197 commit30584cdCopy full SHA for 30584cd

File tree

+12

-4

lines changed

+12

-4

lines changed

Lines changed: 12 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/index/indexam.c,v 1.110 2008/09/11 14:01:09 alvherre Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/index/indexam.c,v 1.111 2008/10/10 14:17:08 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* INTERFACE ROUTINES`
`14`	`14`	`*index_open- open an index relation by relation OID`
`@@ -655,6 +655,7 @@ index_getbitmap(IndexScanDesc scan, TIDBitmap *bitmap)`
`655`	`655`	`{`
`656`	`656`	`FmgrInfo*procedure;`
`657`	`657`	`int64ntids;`
	`658`	`+Datumd;`
`658`	`659`
`659`	`660`	`SCAN_CHECKS;`
`660`	`661`	`GET_SCAN_PROCEDURE(amgetbitmap);`
`@@ -665,9 +666,16 @@ index_getbitmap(IndexScanDesc scan, TIDBitmap *bitmap)`
`665`	`666`	`/*`
`666`	`667`	`* have the am's getbitmap proc do all the work.`
`667`	`668`	`*/`
`668`		`-ntids=DatumGetInt64(FunctionCall2(procedure,`
`669`		`-PointerGetDatum(scan),`
`670`		`-PointerGetDatum(bitmap)));`
	`669`	`+d=FunctionCall2(procedure,`
	`670`	`+PointerGetDatum(scan),`
	`671`	`+PointerGetDatum(bitmap));`
	`672`	`+`
	`673`	`+ntids=DatumGetInt64(d);`
	`674`	`+`
	`675`	`+/* If int8 is pass-by-ref, must free the result to avoid memory leak */`
	`676`	`+#ifndefUSE_FLOAT8_BYVAL`
	`677`	`+pfree(DatumGetPointer(d));`
	`678`	`+#endif`
`671`	`679`
`672`	`680`	`pgstat_count_index_tuples(scan->indexRelation,ntids);`
`673`	`681`

Comments

(0)