[llvm-branch-commits] [cfe-branch] r118043 - /cfe/branches/Apple/whitney/lib/Sema/SemaExprCXX.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Nov  2 15:32:27 2010
New Revision: 118043

URL: http://llvm.org/viewvc/llvm-project?rev=118043&view=rev
Log:
Merge r117954:
--
Author: Douglas Gregor <dgregor at apple.com>
Date:   Mon Nov 1 21:10:29 2010 +0000

    Harden Sema::MaybeBindTotemporary.

Modified:
    cfe/branches/Apple/whitney/lib/Sema/SemaExprCXX.cpp

Modified: cfe/branches/Apple/whitney/lib/Sema/SemaExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Sema/SemaExprCXX.cpp?rev=118043&r1=118042&r2=118043&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Sema/SemaExprCXX.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Sema/SemaExprCXX.cpp Tue Nov  2 15:32:27 2010
@@ -2933,6 +2933,9 @@
 }
 
 ExprResult Sema::MaybeBindToTemporary(Expr *E) {
+  if (!E)
+    return ExprError();
+  
   if (!Context.getLangOptions().CPlusPlus)
     return Owned(E);