[demangler] return early if conditional expr parsing failed

This should fix some bugs found by oss-fuzz. llvm-svn: 324203
llvm · Feb 5, 2018 · 0923542 · 0923542
1 parent 0398ccd
commit 0923542
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/libcxxabi/src/cxa_demangle.cpp b/libcxxabi/src/cxa_demangle.cpp
@@ -2589,10 +2589,15 @@ Node *Db::parseExpr() {
     if (First[1] == 'u') {
       First += 2;
       Node *Cond = parseExpr();
+      if (Cond == nullptr)
+        return nullptr;
       Node *LHS = parseExpr();
+      if (LHS == nullptr)
+        return nullptr;
       Node *RHS = parseExpr();
-      if (Cond && LHS && RHS)
-        return make<ConditionalExpr>(Cond, LHS, RHS);
+      if (RHS == nullptr)
+        return nullptr;
+      return make<ConditionalExpr>(Cond, LHS, RHS);
     }
     return nullptr;
   case 'r':