[llvm-branch-commits] [llvm-gcc-branch] r75710 - /llvm-gcc-4.2/branches/Apple/Bender-SWB/gcc/config/darwin-c.c

[Bill Wendling]

Author: void
Date: Tue Jul 14 18:20:14 2009
New Revision: 75710

URL: http://llvm.org/viewvc/llvm-project?rev=75710&view=rev
Log:
--- Merging r74569 into 'gcc/config/darwin-c.c':
U    gcc/config/darwin-c.c

Detect an error cleanly instead of crashing.

Modified:
    llvm-gcc-4.2/branches/Apple/Bender-SWB/gcc/config/darwin-c.c

Modified: llvm-gcc-4.2/branches/Apple/Bender-SWB/gcc/config/darwin-c.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Bender-SWB/gcc/config/darwin-c.c?rev=75710&r1=75709&r2=75710&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Bender-SWB/gcc/config/darwin-c.c (original)
+++ llvm-gcc-4.2/branches/Apple/Bender-SWB/gcc/config/darwin-c.c Tue Jul 14 18:20:14 2009
@@ -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");