This is an archive of the discontinued LLVM Phabricator instance.

Differential D60206

llvm-undname: Fix an assert-on-invalid
ClosedPublic

Authored by thakis on Apr 3 2019, 8:30 AM.

Details

Reviewers
zturner
Commits
rGa9886f827892: llvm-undame: Fix an assert-on-invalid
rL357648: llvm-undame: Fix an assert-on-invalid
Summary

Found by oss-fuzz, fixes issue 12432 on os-fuzz.

Diff Detail

Event Timeline

thakis created this revision.Apr 3 2019, 8:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 3 2019, 8:30 AM
Herald added a subscriber: hiraditya. · View Herald Transcript
thakis added a parent revision: D60204: llvm-undname: Fix an assert-on-invalid.Apr 3 2019, 9:19 AM
thakis added a child revision: D60207: llvm-undname: Fix a crash-on-invalid.
thakis retitled this revision from llvm-undame: Fix an assert-on-invalid to llvm-undname: Fix an assert-on-invalid.
zturner accepted this revision.Apr 3 2019, 2:41 PM
This revision is now accepted and ready to land.Apr 3 2019, 2:41 PM
Closed by commit rL357648: llvm-undame: Fix an assert-on-invalid (authored by nico). · Explain WhyApr 3 2019, 4:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
Demangle/
5 lines
test/
Demangle/
5 lines

Diff 193513

llvm/lib/Demangle/MicrosoftDemangle.cpp

Show First 20 Lines • Show All 991 Lines • ▼ Show 20 Lines
if (Error) if (Error)
return nullptr; return nullptr;
QualifiedNameNode *QN = demangleNameScopeChain(MangledName, Identifier); QualifiedNameNode *QN = demangleNameScopeChain(MangledName, Identifier);
if (Error) if (Error)
return nullptr; return nullptr;
if (Identifier->kind() == NodeKind::StructorIdentifier) { if (Identifier->kind() == NodeKind::StructorIdentifier) {
if (QN->Components->Count < 2) {
Error = true;
return nullptr;
}
StructorIdentifierNode *SIN = StructorIdentifierNode *SIN =
static_cast<StructorIdentifierNode *>(Identifier); static_cast<StructorIdentifierNode *>(Identifier);
assert(QN->Components->Count >= 2);
Node *ClassNode = QN->Components->Nodes[QN->Components->Count - 2]; Node *ClassNode = QN->Components->Nodes[QN->Components->Count - 2];
SIN->Class = static_cast<IdentifierNode *>(ClassNode); SIN->Class = static_cast<IdentifierNode *>(ClassNode);
} }
assert(QN); assert(QN);
return QN; return QN;
} }
IdentifierNode *Demangler::demangleUnqualifiedTypeName(StringView &MangledName, IdentifierNode *Demangler::demangleUnqualifiedTypeName(StringView &MangledName,
▲ Show 20 Lines • Show All 825 Lines • Show Last 20 Lines

llvm/test/Demangle/invalid-manglings.test

Show All 13 Lines
; CHECK-EMPTY: ; CHECK-EMPTY:
; CHECK-NEXT: ?@@8 ; CHECK-NEXT: ?@@8
; CHECK-NEXT: error: Invalid mangled name ; CHECK-NEXT: error: Invalid mangled name
?? ??
; CHECK-EMPTY: ; CHECK-EMPTY:
; CHECK-NEXT: ?? ; CHECK-NEXT: ??
; CHECK-NEXT: error: Invalid mangled name ; CHECK-NEXT: error: Invalid mangled name
??0@
; CHECK-EMPTY:
; CHECK-NEXT: ??0@
; CHECK-NEXT: error: Invalid mangled name