diff options
| author | Mehdi Amini <mehdi.amini@apple.com> | 2017-01-27 20:32:16 +0000 |
|---|---|---|
| committer | Mehdi Amini <mehdi.amini@apple.com> | 2017-01-27 20:32:16 +0000 |
| commit | 453ab3522b5ba2a922d0f02c7a73bd2beeca4d57 (patch) | |
| tree | 4a6ce89785f69bbec292abae34af780b48793c6d | |
| parent | 888dee444bef47e65886863aa1f9667ee5782879 (diff) | |
| download | bcm5719-llvm-453ab3522b5ba2a922d0f02c7a73bd2beeca4d57.tar.gz bcm5719-llvm-453ab3522b5ba2a922d0f02c7a73bd2beeca4d57.zip | |
Fix ASAN failure in cxa_demangle
Found with ASAN + libFuzzer by Kostya Serebryany <kcc@google.com>
llvm-svn: 293330
| -rw-r--r-- | libcxxabi/src/cxa_demangle.cpp | 3 | ||||
| -rw-r--r-- | libcxxabi/test/test_demangle.pass.cpp | 1 | ||||
| -rw-r--r-- | llvm/lib/Demangle/ItaniumDemangle.cpp | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/libcxxabi/src/cxa_demangle.cpp b/libcxxabi/src/cxa_demangle.cpp index 8f5cb3024ad..6d46b79605c 100644 --- a/libcxxabi/src/cxa_demangle.cpp +++ b/libcxxabi/src/cxa_demangle.cpp @@ -1611,7 +1611,8 @@ parse_function_type(const char* first, const char* last, C& db) { if (t == last) { - db.names.pop_back(); + if (!db.names.empty()) + db.names.pop_back(); return first; } if (*t == 'E') diff --git a/libcxxabi/test/test_demangle.pass.cpp b/libcxxabi/test/test_demangle.pass.cpp index 4eb6a882abe..22d982307b7 100644 --- a/libcxxabi/test/test_demangle.pass.cpp +++ b/libcxxabi/test/test_demangle.pass.cpp @@ -29662,6 +29662,7 @@ const char* invalid_cases[] = "\x44\x74\x71\x75\x35\x2A\xDF\x74\x44\x61\x73\x63\x35\x2A\x3B\x41\x72\x4D\x6E\x65\x34\x9F\xC1\x63\x41\x72\x4D\x6E\x77\x38\x9A\x8E\x44\x6F\x64\x6C\x53\xF9\x5F\x70\x74\x70\x69\x45\x33\x44\x76\x35", "\x44\x74\x70\x74\x71\x75\x32\x43\x41\x38\x65\x6E\x9B\x72\x4D\xC1\x43\x41\x72\x4D\x6E\x77\x38\x9A\x8E\x44\x6F\x64\x6C\x53\xF9\x5F\x70\x74\x70\x69\x45\x38\xD3\x73\x9E\x2A\x37", "\x46\x44\x74\x70\x74\x71\x75\x32\x43\x41\x72\x4D\x6E\x65\x34\x9F\xC1\x43\x41\x72\x4D\x6E\x77\x38\x9A\x8E\x44\x6F\x64\x6C\x53\xF9\x5F\x70\x74\x70\x69\x45\x34\xD3\x73\x9E\x2A\x37\x72\x33\x8E\x3A\x29\x8E\x44\x35", + "_ZcvCiIJEEDvT__FFFFT_vT_v", }; const unsigned NI = sizeof(invalid_cases) / sizeof(invalid_cases[0]); diff --git a/llvm/lib/Demangle/ItaniumDemangle.cpp b/llvm/lib/Demangle/ItaniumDemangle.cpp index 59f6c2d3612..5a0352c5390 100644 --- a/llvm/lib/Demangle/ItaniumDemangle.cpp +++ b/llvm/lib/Demangle/ItaniumDemangle.cpp @@ -1402,7 +1402,8 @@ static const char *parse_function_type(const char *first, const char *last, int ref_qual = 0; while (true) { if (t == last) { - db.names.pop_back(); + if (!db.names.empty()) + db.names.pop_back(); return first; } if (*t == 'E') { |
