commit b90082274531c38eb75bb5d30aac876d338004ea
author Erik Pilkington <erik.pilkington@gmail.com> Tue Aug 01 02:38:41 2017 +0000
committer Erik Pilkington <erik.pilkington@gmail.com> Tue Aug 01 02:38:41 2017 +0000
tree 19556c4eb2278943913d393fa9a13b7275323c04
parent d25d9018b6c470126aa89c9c6b2c7e8e9c78ef5c

[demangler] Fix another bug found by oss-fuzz in r309340

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

src/cxa_demangle.cpp

diff --git a/src/cxa_demangle.cpp b/src/cxa_demangle.cpp
index e13358b..88990a2 100644
--- a/src/cxa_demangle.cpp
+++ b/src/cxa_demangle.cpp
@@ -5867,6 +5867,8 @@
                     if (t != last && *t == 'v')
                     {
                         ++t;
+                        if (db.names.empty())
+                            return first;
                         Node* name = db.names.back();
                         db.names.pop_back();
                         result = db.make<TopLevelFunctionDecl>(

test/test_demangle.pass.cpp

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