Bug 143 - ICE when error message contains embedded format attributes

D-Programming-GDC · Jul 21, 2014 · 553a30c · 553a30c
1 parent 5bcfb8b
commit 553a30c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/gcc/d/ChangeLog b/gcc/d/ChangeLog
@@ -3,6 +3,7 @@
 	* d-objfile.cc(output_declaration_p): Don't emit any declarations from
 	the gcc.attribute module.
 	(StructDeclaration::toObjFile): Call output_declaration_p.
+	* d-glue.cc(verror): Only call vasprintf on the initial format string.
 
 2014-07-17  Iain Buclaw  <ibuclaw@gdcproject.org>
 

diff --git a/gcc/d/d-glue.cc b/gcc/d/d-glue.cc
@@ -182,14 +182,16 @@ verror (Loc loc, const char *format, va_list ap,
       char *msg;
 
       // Build string and emit.
-      if (p2)
-	format = concat (p2, " ", format, NULL);
+      if (vasprintf (&msg, format, ap) >= 0 && msg != NULL)
+	{
+	  if (p2)
+	    msg = concat (p2, " ", msg, NULL);
 
-      if (p1)
-	format = concat (p1, " ", format, NULL);
+	  if (p1)
+	    msg = concat (p1, " ", msg, NULL);
 
-      if (vasprintf (&msg, format, ap) >= 0 && msg != NULL)
-	error_at (location, "%s", msg);
+	  error_at (location, "%s", msg);
+	}
 
       // Moderate blizzard of cascading messages
       if (global.errors >= 20)

diff --git a/gcc/testsuite/gdc.test/runnable/gdc.d b/gcc/testsuite/gdc.test/runnable/gdc.d
@@ -738,7 +738,6 @@ void main()
     test131();
     test133();
     test141();
-    test142();
 
     printf("Success!\n");
 }