summaryrefslogtreecommitdiffstats
path: root/libcxxabi/src
diff options
context:
space:
mode:
authorErik Pilkington <erik.pilkington@gmail.com>2017-08-01 02:38:41 +0000
committerErik Pilkington <erik.pilkington@gmail.com>2017-08-01 02:38:41 +0000
commit906d585686af9c4d32fae3a254c3529cba01f622 (patch)
tree9356c1d7cebe2a24cec45df830d78e78612fe708 /libcxxabi/src
parentdeec87836a02bcf9915a4e58e7c2e411e01a0965 (diff)
downloadbcm5719-llvm-906d585686af9c4d32fae3a254c3529cba01f622.tar.gz
bcm5719-llvm-906d585686af9c4d32fae3a254c3529cba01f622.zip
[demangler] Fix another bug found by oss-fuzz in r309340
llvm-svn: 309650
Diffstat (limited to 'libcxxabi/src')
-rw-r--r--libcxxabi/src/cxa_demangle.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libcxxabi/src/cxa_demangle.cpp b/libcxxabi/src/cxa_demangle.cpp
index e13358b7ef9..88990a2dffb 100644
--- a/libcxxabi/src/cxa_demangle.cpp
+++ b/libcxxabi/src/cxa_demangle.cpp
@@ -5867,6 +5867,8 @@ parse_encoding(const char* first, const char* last, Db& db)
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>(
OpenPOWER on IntegriCloud