xml: beware of user strings used to give a %prec to rules.

	* tests/conflicts.at (%prec with user strings): New.
	* src/gram.c (grammar_rules_print_xml): Escape the precedence for
	XML output.

diff --git a/ChangeLog b/ChangeLog
index ebe13d3a4c959e5452f0cb95e6afbf9e350a5202..68599de6635300c82b9368dea6b853fd90fb5ba0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-11  Akim Demaille  <demaille@gostai.com>
+
+       xml: beware of user strings used to give a %prec to rules.
+       * tests/conflicts.at (%prec with user strings): New.
+       * src/gram.c (grammar_rules_print_xml): Escape the precedence for
+       XML output.
+
 2009-06-11  Akim Demaille  <demaille@gostai.com>
 
        hash: check insertion for memory exhaustion.

diff --git a/src/gram.c b/src/gram.c
index 6b9eda13b7c4d60df0950388bf27dfeec3919b81..243b07f0b8f891565b9dcda7cd65876b5e7e50b8 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,7 +1,7 @@
 /* Allocate input grammar variables for Bison.
 
    Copyright (C) 1984, 1986, 1989, 2001, 2002, 2003, 2005, 2006
-   2007 Free Software Foundation, Inc.
+   2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -224,7 +224,8 @@ grammar_rules_print_xml (FILE *out, int level)
         fprintf (out, "<rule number=\"%d\" usefulness=\"%s\"",
                  rules[r].number, usefulness);
         if (rules[r].precsym)
-          fprintf (out, " percent_prec=\"%s\"", rules[r].precsym->tag);
+          fprintf (out, " percent_prec=\"%s\"",
+                   xml_escape (rules[r].precsym->tag));
         fputs (">\n", out);
       }
       rule_lhs_print_xml (&rules[r], out, level + 3);

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 78a90ad0d6796440358b0cc5375cf60ac5fcb3d6..bf854e8ec689259680091968d83fdc98cb8ddfea 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -544,9 +544,26 @@ input.y: expected 0 reduce/reduce conflicts
 AT_CLEANUP
 
 
-## ------------------------------- ##
-## %no-default-prec without %prec  ##
-## ------------------------------- ##
+## ------------------------- ##
+## %prec with user strings.  ##
+## ------------------------- ##
+
+AT_SETUP([%prec with user string])
+
+AT_DATA([[input.y]],
+[[%%
+exp:
+  "foo" %prec "foo"
+;
+]])
+
+AT_BISON_CHECK([-o input.c input.y])
+AT_CLEANUP
+
+
+## -------------------------------- ##
+## %no-default-prec without %prec.  ##
+## -------------------------------- ##
 
 AT_SETUP([%no-default-prec without %prec])