Commit7d6fbe1

committed

Evaluate LIMIT/OFFSET expressions with ExecEvalExprSwitchContext, not

ExecEvalExpr, to avoid possible memory leak.

1 parent5558e15 commit7d6fbe1Copy full SHA for 7d6fbe1

File tree

+11

-9

lines changed

+11

-9

lines changed

Lines changed: 11 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/executor/nodeLimit.c,v 1.6 2001/03/23 04:49:53 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeLimit.c,v 1.7 2001/08/06 18:05:07 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -164,10 +164,11 @@ recompute_limits(Limit *node)`
`164`	`164`
`165`	`165`	`if (node->limitOffset)`
`166`	`166`	`{`
`167`		`-limitstate->offset=DatumGetInt32(ExecEvalExpr(node->limitOffset,`
`168`		`-econtext,`
`169`		`-&isNull,`
`170`		`-NULL));`
	`167`	`+limitstate->offset=`
	`168`	`+DatumGetInt32(ExecEvalExprSwitchContext(node->limitOffset,`
	`169`	`+econtext,`
	`170`	`+&isNull,`
	`171`	`+NULL));`
`171`	`172`	`/* Interpret NULL offset as no offset */`
`172`	`173`	`if (isNull)`
`173`	`174`	`limitstate->offset=0;`
`@@ -182,10 +183,11 @@ recompute_limits(Limit *node)`
`182`	`183`
`183`	`184`	`if (node->limitCount)`
`184`	`185`	`{`
`185`		`-limitstate->count=DatumGetInt32(ExecEvalExpr(node->limitCount,`
`186`		`-econtext,`
`187`		`-&isNull,`
`188`		`-NULL));`
	`186`	`+limitstate->count=`
	`187`	`+DatumGetInt32(ExecEvalExprSwitchContext(node->limitCount,`
	`188`	`+econtext,`
	`189`	`+&isNull,`
	`190`	`+NULL));`
`189`	`191`	`/* Interpret NULL count as no count (LIMIT ALL) */`
`190`	`192`	`if (isNull)`
`191`	`193`	`limitstate->noCount= true;`

Comments

(0)