diff options
author | Palle Girgensohn <girgen@FreeBSD.org> | 2005-04-13 23:15:49 +0000 |
---|---|---|
committer | Palle Girgensohn <girgen@FreeBSD.org> | 2005-04-13 23:15:49 +0000 |
commit | 763de9d278b9b9f456337dfb5abee68f4358669a (patch) | |
tree | fe532f0d34c4bde2fb18a2dbcec2f5dccbe98d54 /databases/postgresql80-server/files | |
parent | 9229feb6467b1a259abb9c78c61334e3d1cec807 (diff) | |
download | ports-763de9d278b9b9f456337dfb5abee68f4358669a.tar.gz ports-763de9d278b9b9f456337dfb5abee68f4358669a.zip |
Notes
Diffstat (limited to 'databases/postgresql80-server/files')
-rw-r--r-- | databases/postgresql80-server/files/patch-src-pl-plpgsql-src-gram-y | 80 | ||||
-rw-r--r-- | databases/postgresql80-server/files/patch-src-pl-plpgsql-src-pl-gram-c | 91 |
2 files changed, 0 insertions, 171 deletions
diff --git a/databases/postgresql80-server/files/patch-src-pl-plpgsql-src-gram-y b/databases/postgresql80-server/files/patch-src-pl-plpgsql-src-gram-y deleted file mode 100644 index 672745ce2760..000000000000 --- a/databases/postgresql80-server/files/patch-src-pl-plpgsql-src-gram-y +++ /dev/null @@ -1,80 +0,0 @@ ---- src/pl/plpgsql/src/gram.y 2005/01/21 00:17:02 1.64.4.1 REL8_0_1 -+++ src/pl/plpgsql/src/gram.y 2005/02/08 18:21:59 1.64.4.3 REL8_0_STABLE -@@ -4,7 +4,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. - * -@@ -1766,8 +1766,19 @@ read_sql_construct(int until, - 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: -@@ -1940,6 +1951,15 @@ make_select_stmt(void) - - while ((tok = 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 = yylex(); - switch(tok) - { -@@ -1990,6 +2010,16 @@ make_select_stmt(void) - - 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: -@@ -2085,6 +2115,15 @@ make_fetch_stmt(void) - - while ((tok = 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 = yylex(); - switch(tok) - { diff --git a/databases/postgresql80-server/files/patch-src-pl-plpgsql-src-pl-gram-c b/databases/postgresql80-server/files/patch-src-pl-plpgsql-src-pl-gram-c deleted file mode 100644 index e4cb940fda72..000000000000 --- a/databases/postgresql80-server/files/patch-src-pl-plpgsql-src-pl-gram-c +++ /dev/null @@ -1,91 +0,0 @@ ---- /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 |