summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2011-05-24 21:07:15 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2011-05-24 21:07:15 +0000
commit654a246344a2c9bc7294eef297df197a46362517 (patch)
tree9cda4efe2dc1678c56b4ee92598bb025ccd0844d /gcc
parent4eac1d9621db40b5631a0058727126688b3d22e6 (diff)
downloadgcc-654a246344a2c9bc7294eef297df197a46362517.tar.gz
* godump.c (go_define): Don't accept a string immediately after
another operand. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174141 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/godump.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7264b1515af..9a5a4963594 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2011-05-24 Ian Lance Taylor <iant@google.com>
+ * godump.c (go_define): Don't accept a string immediately after
+ another operand.
+
+2011-05-24 Ian Lance Taylor <iant@google.com>
+
* godump.c (struct godump_container): Add invalid_hash field.
(go_format_type): Return false if type is found in invalid_hash.
(go_output_typedef): Add invalid type to invalid_hash.
diff --git a/gcc/godump.c b/gcc/godump.c
index 4009899ecea..35db1d6a8c4 100644
--- a/gcc/godump.c
+++ b/gcc/godump.c
@@ -300,7 +300,11 @@ go_define (unsigned int lineno, const char *buffer)
case '"':
case '\'':
{
- char quote = *p;
+ char quote;
+
+ if (saw_operand)
+ goto unknown;
+ quote = *p;
*q++ = *p++;
while (*p != quote)
{