projects / postgresql.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ebe0341)
Back-patch Neil's four additional buffer overrun checks.
authorTom Lane <tgl@sss.pgh.pa.us>
Tue, 8 Feb 2005 18:22:54 +0000 (18:22 +0000)
committerTom Lane <tgl@sss.pgh.pa.us>
Tue, 8 Feb 2005 18:22:54 +0000 (18:22 +0000)
src/pl/plpgsql/src/gram.y patch | blob | blame | history

diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
index 725f12f1d32c7e91a167d7aa0ebb9d76579b13ed..586dd89aa00e8e0030eedfeefa232eeffb571be2 100644 (file)
--- a/src/pl/plpgsql/src/gram.y
+++ b/src/pl/plpgsql/src/gram.y
@@ -4,7 +4,7 @@
  *                       procedural language
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.29.2.2 2005/01/27 01:52:34 neilc Exp $
+ *   $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.29.2.3 2005/02/08 18:22:54 tgl Exp $
  *
  *   This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -1565,6 +1565,14 @@ read_sql_construct(int until,
        }
        if (plpgsql_SpaceScanned)
            plpgsql_dstring_append(&ds, " ");
+
+       /* Check for array overflow */
+       if (nparams >= 1024)
+       {
+           plpgsql_error_lineno = lno;
+           elog(ERROR, "too many variables specified in SQL statement");
+       }
+
        switch (tok)
        {
            case T_VARIABLE:
@@ -1708,6 +1716,14 @@ make_select_stmt()
 
        if (plpgsql_SpaceScanned)
            plpgsql_dstring_append(&ds, " ");
+
+       /* Check for array overflow */
+       if (nparams >= 1024)
+       {
+           plpgsql_error_lineno = yylineno;
+           elog(ERROR, "too many variables specified in SQL statement");
+       }
+
        switch (tok)
        {
            case T_VARIABLE:
@@ -1776,6 +1792,13 @@ make_select_stmt()
 
                while ((tok = yylex()) == ',')
                {
+                   /* Check for array overflow */
+                   if (nfields >= 1024)
+                   {
+                       plpgsql_error_lineno = yylineno;
+                       elog(ERROR, "too many INTO variables specified");
+                   }
+
                    tok = yylex();
                    switch(tok)
                    {
@@ -1992,6 +2015,13 @@ make_fetch_stmt()
 
                while ((tok = yylex()) == ',')
                {
+                   /* Check for array overflow */
+                   if (nfields >= 1024)
+                   {
+                       plpgsql_error_lineno = yylineno;
+                       elog(ERROR, "too many INTO variables specified");
+                   }
+
                    tok = yylex();
                    switch(tok)
                    {
This is the main PostgreSQL git repository.