commit 1137f968e72317fc7bd7b73e9483023367c8a55b
author Erik Pilkington <erik.pilkington@gmail.com> Sun Aug 06 20:46:33 2017 +0000
committer Erik Pilkington <erik.pilkington@gmail.com> Sun Aug 06 20:46:33 2017 +0000
tree a39a390a41cad128caf54e3488e427e77386c7a6
parent b90082274531c38eb75bb5d30aac876d338004ea

[demangler] Fix another oss-fuzz bug

git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@310226 91177308-0d34-0410-b5e6-96231b3b80d8

src/cxa_demangle.cpp

diff --git a/src/cxa_demangle.cpp b/src/cxa_demangle.cpp
index 88990a2..0281b50 100644
--- a/src/cxa_demangle.cpp
+++ b/src/cxa_demangle.cpp
@@ -2896,7 +2896,7 @@
                     return first;
                 init_list = db.popTrailingNodeArray(init_list_begin);
             }
-            if (*t != 'E')
+            if (*t != 'E' || db.names.empty())
                 return first;
             auto type = db.names.back();
             db.names.pop_back();

test/test_demangle.pass.cpp

diff --git a/test/test_demangle.pass.cpp b/test/test_demangle.pass.cpp
index 3b712f0..18bbbba 100644
--- a/test/test_demangle.pass.cpp
+++ b/test/test_demangle.pass.cpp
@@ -29677,6 +29677,7 @@
     "FSiIJEENT_IoE ",
     "ZTVSiIZTVSiIZTVSiIZTVSiINIJEET_T_T_T_T_ ",
     "_ZSiIJEvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvttvvvvvvET_v",
+    "Ana_T_E_T_IJEffffffffffffffersfffffrsrsffffffbgE",
 };
 
 const unsigned NI = sizeof(invalid_cases) / sizeof(invalid_cases[0]);