summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2005-08-16 00:48:58 +0000
committerTom Lane2005-08-16 00:48:58 +0000
commitbec2f429afe01f41bc8e7c69deef03b46b911139 (patch)
treedd15ffda78688f7463cc2b135d4514a2aaef1c4e
parentf7395660695eb14389124815bd0a616ad6186381 (diff)
Reject operator names >= NAMEDATALEN characters. These will not work
anyway, and in assert-enabled builds you are likely to get an assertion failure. Backpatch as far as 7.3; 7.2 seems not to have the problem.
-rw-r--r--src/backend/parser/scan.l11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index c1c23a67240..a902e2828d8 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.102.2.1 2002/11/11 03:33:44 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.102.2.2 2005/08/16 00:48:58 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -484,6 +484,15 @@ other .
return yytext[0];
}
+ /*
+ * Complain if operator is too long. Unlike the case
+ * for identifiers, we make this an error not a notice-
+ * and-truncate, because the odds are we are looking at
+ * a syntactic mistake anyway.
+ */
+ if (nchars >= NAMEDATALEN)
+ yyerror("operator too long");
+
/* Convert "!=" operator to "<>" for compatibility */
if (strcmp(yytext, "!=") == 0)
yylval.str = pstrdup("<>");