--- /opt/portbuild/tmp/opt/ports/databases/postgresql80-server/work/postgresql-8.0.1/src/pl/plpgsql/src/pl_gram.c Mon Jan 31 02:41:48 2005 +++ src/pl/plpgsql/src/pl_gram.c Sun Feb 20 02:19:34 2005 @@ -191,7 +191,7 @@ * procedural language * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.1 2005/01/21 00:17:02 neilc Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.64.4.2 2005/02/07 03:52:22 neilc Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -3426,8 +3412,19 @@ errmsg("missing \"%s\" at end of SQL statement", expected))); } + if (plpgsql_SpaceScanned) plpgsql_dstring_append(&ds, " "); + + /* Check for array overflow */ + if (nparams >= 1024) + { + plpgsql_error_lineno = lno; + ereport(ERROR, + (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), + errmsg("too many variables specified in SQL statement"))); + } + switch (tok) { case T_SCALAR: @@ -3600,6 +3597,15 @@ while ((tok = plpgsql_yylex()) == ',') { + /* Check for array overflow */ + if (nfields >= 1024) + { + plpgsql_error_lineno = plpgsql_scanner_lineno(); + ereport(ERROR, + (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), + errmsg("too many INTO variables specified"))); + } + tok = plpgsql_yylex(); switch(tok) { @@ -3650,6 +3656,16 @@ if (plpgsql_SpaceScanned) plpgsql_dstring_append(&ds, " "); + + /* Check for array overflow */ + if (nparams >= 1024) + { + plpgsql_error_lineno = plpgsql_scanner_lineno(); + ereport(ERROR, + (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), + errmsg("too many variables specified in SQL statement"))); + } + switch (tok) { case T_SCALAR: @@ -3745,6 +3761,15 @@ while ((tok = plpgsql_yylex()) == ',') { + /* Check for array overflow */ + if (nfields >= 1024) + { + plpgsql_error_lineno = plpgsql_scanner_lineno(); + ereport(ERROR, + (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), + errmsg("too many INTO variables specified"))); + } + tok = plpgsql_yylex(); switch(tok) { --- src/pl/plpgsql/src/pl.tab.h.orig Sun Feb 20 06:27:24 2005 +++ src/pl/plpgsql/src/pl.tab.h Sun Feb 20 06:27:34 2005 @@ -209,7 +209,7 @@ PLpgSQL_exceptions *exceptions; PLpgSQL_nsitem *nsitem; } PLPGSQL_YYSTYPE; -/* Line 1248 of yacc.c. */ +/* Line 1238 of yacc.c. */ #line 213 "y.tab.h" # define plpgsql_yystype PLPGSQL_YYSTYPE /* obsolescent; will be withdrawn */ # define PLPGSQL_YYSTYPE_IS_DECLARED 1