From f5c7f3ad33eb66ee80648f0ca040b0f6e1731e0a Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Mon, 22 Apr 2019 15:05:18 +0000 Subject: [PATCH] llvm-undname: Fix an assert-on-invalid, found by oss-fuzz llvm-svn: 358891 --- llvm/lib/Demangle/MicrosoftDemangle.cpp | 2 +- llvm/test/Demangle/invalid-manglings.test | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/llvm/lib/Demangle/MicrosoftDemangle.cpp b/llvm/lib/Demangle/MicrosoftDemangle.cpp index f9400b0..beb5169 100644 --- a/llvm/lib/Demangle/MicrosoftDemangle.cpp +++ b/llvm/lib/Demangle/MicrosoftDemangle.cpp @@ -1040,7 +1040,7 @@ wchar_t Demangler::demangleWcharLiteral(StringView &MangledName) { uint8_t C1, C2; C1 = demangleCharLiteral(MangledName); - if (Error) + if (Error || MangledName.empty()) goto WCharLiteralError; C2 = demangleCharLiteral(MangledName); if (Error) diff --git a/llvm/test/Demangle/invalid-manglings.test b/llvm/test/Demangle/invalid-manglings.test index fb66c2b..d64ec4f 100644 --- a/llvm/test/Demangle/invalid-manglings.test +++ b/llvm/test/Demangle/invalid-manglings.test @@ -164,3 +164,8 @@ ; CHECK-EMPTY: ; CHECK-NEXT: ??_C@_0601234567@abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRTSUVWXYZabcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRTSUVWXYZabcdefghijklmnopqrtsuvwxyz ; CHECK-NEXT: error: Invalid mangled name + +??_C@_12@?z +; CHECK-EMPTY: +; CHECK-NEXT: ??_C@_12@?z +; CHECK-NEXT: error: Invalid mangled name -- 2.7.4