Commitbfce56e

committed

Throw an error for negative LIMIT or OFFSET values, instead of silently

treating them as zero. Simon Riggs

1 parent2abf130 commitbfce56eCopy full SHA for bfce56e

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 3 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/executor/nodeLimit.c,v 1.33 2008/01/01 19:45:49 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.34 2008/03/10 03:37:59 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -246,7 +246,9 @@ recompute_limits(LimitState *node)`
`246`	`246`	`{`
`247`	`247`	`node->offset=DatumGetInt64(val);`
`248`	`248`	`if (node->offset<0)`
`249`		`-node->offset=0;`
	`249`	`+ereport(ERROR,`
	`250`	`+(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
	`251`	`+errmsg("OFFSET must not be negative")));`
`250`	`252`	`}`
`251`	`253`	`}`
`252`	`254`	`else`
`@@ -271,7 +273,9 @@ recompute_limits(LimitState *node)`
`271`	`273`	`{`
`272`	`274`	`node->count=DatumGetInt64(val);`
`273`	`275`	`if (node->count<0)`
`274`		`-node->count=0;`
	`276`	`+ereport(ERROR,`
	`277`	`+(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
	`278`	`+errmsg("LIMIT must not be negative")));`
`275`	`279`	`node->noCount= false;`
`276`	`280`	`}`
`277`	`281`	`}`

Comments

(0)