diff --git a/llvm/lib/Demangle/MicrosoftDemangle.cpp b/llvm/lib/Demangle/MicrosoftDemangle.cpp --- a/llvm/lib/Demangle/MicrosoftDemangle.cpp +++ b/llvm/lib/Demangle/MicrosoftDemangle.cpp @@ -793,6 +793,7 @@ return nullptr; } const char *Start = &*MangledName.begin(); + const size_t StartSize = MangledName.size(); MangledName.remove_prefix(MD5Last + 1); // There are two additional special cases for MD5 names: @@ -807,7 +808,9 @@ // either. consumeFront(MangledName, "??_R4@"); - std::string_view MD5(Start, &*MangledName.begin() - Start); + assert(MangledName.size() < StartSize); + const size_t Count = StartSize - MangledName.size(); + std::string_view MD5(Start, Count); SymbolNode *S = Arena.alloc(NodeKind::Md5Symbol); S->Name = synthesizeQualifiedName(Arena, MD5); @@ -2402,7 +2405,7 @@ std::string_view Name{MangledName}; SymbolNode *AST = D.parse(Name); if (!D.Error && NMangled) - *NMangled = &*Name.begin() - MangledName; + *NMangled = Name.empty() ? 0 : &*Name.begin() - MangledName; if (Flags & MSDF_DumpBackrefs) D.dumpBackReferences();