mirror of
https://git.freebsd.org/ports.git
synced 2025-06-06 05:10:29 -04:00
9c89540227
Prevent overrunning a heap-allocated buffer if more than 1024 parameters to a refcursor declaration are specified. This is a minimally-invasive fix for the buffer overrun. Define LATEST_LINK to avoid package name clashes between the different branches of PostgreSQL. [1] (Since postgresql-tcltk is hardwired to branch 7.4, keep its LATEST_LINK to a generic value.) Set UNIQUENAME and let it be the same for server & client, so each branch's ports will share the same options file. This adds some no-op knobs to the -client port, but IMO it is better this way. Add space inside paranthesis in OSVERSION conditional to work around (ancient) make bug. [2] Remove the Rendez-Vouz knob for 8.0 since I can't find the software needed to even compile it on FreeBSD. Bump portrevision (for -server only). Noted by: kris [1] PR: ports/77530 [2] Security: http://www.vuxml.org/freebsd/6b4b0b3f-8127-11d9-a9e7-0001020eed82.html Approved by: seanc (mentor)
80 lines
2.1 KiB
Text
80 lines
2.1 KiB
Text
--- 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)
|
|
{
|