commit dd14331b2dd45c24fbcfae1ec4f2aceed0ad6745
author Bill Wendling <isanbard@gmail.com> Tue Jul 14 23:20:14 2009 +0000
committer Bill Wendling <isanbard@gmail.com> Tue Jul 14 23:20:14 2009 +0000
tree bd1892f2c06dc48ad2098f74c64c9d2b3a150951
parent 598baae45ba5c6c7fb6479562cdf431fc715bb97

--- Merging r74569 into 'gcc/config/darwin-c.c':
U    gcc/config/darwin-c.c

Detect an error cleanly instead of crashing.

llvm-svn: 75710

llvm-gcc-4.2/gcc/config/darwin-c.c

diff --git a/llvm-gcc-4.2/gcc/config/darwin-c.c b/llvm-gcc-4.2/gcc/config/darwin-c.c
index 6813716..7cf4124 100644
--- a/llvm-gcc-4.2/gcc/config/darwin-c.c
+++ b/llvm-gcc-4.2/gcc/config/darwin-c.c
@@ -1161,6 +1161,14 @@
        argument = TREE_CHAIN (argument);
     }
 
+  /* APPLE LOCAL begin 7020016 */
+  if (argument == NULL_TREE)
+    {
+      error ("argument number of CFString format too large");
+      *no_add_attrs = true;
+      return false;
+    }
+  /* APPLE LOCAL end 7020016 */
   if (!objc_check_cfstringref_type (TREE_VALUE (argument)))
     {
       error ("format CFString argument not an 'CFStringRef' type");