From: Ian Lance Taylor <iant@google.com>
Date: Fri, 23 Sep 2011 14:28:13 +0000 (+0000)
Subject: godump.c (go_define): Treat a single character in single quotes, or a string, as... 
X-Git-Tag: releases/gcc-4.7.0~3621
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e4ef69ef80e6ef91c4897f0d6c0f7e47fdfd279;p=thirdparty%2Fgcc.git

godump.c (go_define): Treat a single character in single quotes, or a string, as an operand.

	* godump.c (go_define): Treat a single character in single quotes,
	or a string, as an operand.

From-SVN: r179118
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 65f8bce51eaa..424404f40f4e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-23  Ian Lance Taylor  <iant@google.com>
+
+	* godump.c (go_define): Treat a single character in single quotes,
+	or a string, as an operand.
+
 2011-09-23  Martin Jambor  <mjambor@suse.cz>
 
 	* ipa-prop.h (jump_func_type): Updated comments.
diff --git a/gcc/godump.c b/gcc/godump.c
index 3f78eead2794..11cd32998ec9 100644
--- a/gcc/godump.c
+++ b/gcc/godump.c
@@ -301,11 +301,13 @@ go_define (unsigned int lineno, const char *buffer)
 	case '\'':
 	  {
 	    char quote;
+	    int count;
 
 	    if (saw_operand)
 	      goto unknown;
 	    quote = *p;
 	    *q++ = *p++;
+	    count = 0;
 	    while (*p != quote)
 	      {
 		int c;
@@ -313,6 +315,8 @@ go_define (unsigned int lineno, const char *buffer)
 		if (*p == '\0')
 		  goto unknown;
 
+		++count;
+
 		if (*p != '\\')
 		  {
 		    *q++ = *p++;
@@ -358,7 +362,15 @@ go_define (unsigned int lineno, const char *buffer)
 		    goto unknown;
 		  }
 	      }
+
 	    *q++ = *p++;
+
+	    if (quote == '\'' && count != 1)
+	      goto unknown;
+
+	    saw_operand = true;
+	    need_operand = false;
+
 	    break;
 	  }