postgres
diff --git a/‎contrib/tablefunc/expected/tablefunc.out
Copy file name to clipboardExpand all lines: contrib/tablefunc/expected/tablefunc.out
+7-4Lines changed: 7 additions & 4 deletions b/‎contrib/tablefunc/expected/tablefunc.out
Copy file name to clipboardExpand all lines: contrib/tablefunc/expected/tablefunc.out
+7-4Lines changed: 7 additions & 4 deletions
diff --git a/‎contrib/tablefunc/sql/tablefunc.sql
Copy file name to clipboardExpand all lines: contrib/tablefunc/sql/tablefunc.sql
+3-1Lines changed: 3 additions & 1 deletion b/‎contrib/tablefunc/sql/tablefunc.sql
Copy file name to clipboardExpand all lines: contrib/tablefunc/sql/tablefunc.sql
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎contrib/tablefunc/tablefunc.c
Copy file name to clipboardExpand all lines: contrib/tablefunc/tablefunc.c
+8-1Lines changed: 8 additions & 1 deletion b/‎contrib/tablefunc/tablefunc.c
Copy file name to clipboardExpand all lines: contrib/tablefunc/tablefunc.c
+8-1Lines changed: 8 additions & 1 deletion
@@ -3,12 +3,15 @@ CREATE EXTENSION tablefunc;
 -- normal_rand()
 -- no easy way to do this for regression testing
 --
-SELECT avg(normal_rand)::int FROM normal_rand(100, 250, 0.2);
- avg 
------
- 250
+SELECT avg(normal_rand)::int, count(*) FROM normal_rand(100, 250, 0.2);
+ avg | count 
+-----+-------
+ 250 |   100
 (1 row)
 
+-- negative number of tuples
+SELECT avg(normal_rand)::int, count(*) FROM normal_rand(-1, 250, 0.2);
+ERROR:  number of rows cannot be negative
 --
 -- crosstab()
 --
 
@@ -4,7 +4,9 @@ CREATE EXTENSION tablefunc;
 -- normal_rand()
 -- no easy way to do this for regression testing
 --
-SELECT avg(normal_rand)::int FROM normal_rand(100, 250, 0.2);
+SELECT avg(normal_rand)::int, count(*) FROM normal_rand(100, 250, 0.2);
+-- negative number of tuples
+SELECT avg(normal_rand)::int, count(*) FROM normal_rand(-1, 250, 0.2);
 
 --
 -- crosstab()
 
@@ -184,6 +184,8 @@ normal_rand(PG_FUNCTION_ARGS)
 	/* stuff done only on the first call of the function */
 	if (SRF_IS_FIRSTCALL())
 	{
+		int32		num_tuples;
+
 		/* create a function context for cross-call persistence */
 		funcctx = SRF_FIRSTCALL_INIT();
 
@@ -193,7 +195,12 @@ normal_rand(PG_FUNCTION_ARGS)
 		oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
 
 		/* total number of tuples to be returned */
-		funcctx->max_calls = PG_GETARG_UINT32(0);
+		num_tuples = PG_GETARG_INT32(0);
+		if (num_tuples < 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("number of rows cannot be negative")));
+		funcctx->max_calls = num_tuples;
 
 		/* allocate memory for user context */
 		fctx = (normal_rand_fctx *) palloc(sizeof(normal_rand_fctx));