Skip to content

Demangler: don’t crash if demangling a malformed KeyPath[GS]etterThunkHelper #9878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2017
Merged

Demangler: don’t crash if demangling a malformed KeyPath[GS]etterThunkHelper #9878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/Demangling/Demangler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1263,7 +1263,8 @@ NodePointer Demangler::demangleThunkOrSpecialization() {
: Node::Kind::KeyPathSetterThunkHelper;
auto type = popNode();
auto sigOrDecl = popNode();
if (sigOrDecl->getKind() == Node::Kind::DependentGenericSignature) {
if (sigOrDecl &&
sigOrDecl->getKind() == Node::Kind::DependentGenericSignature) {
auto decl = popNode();
return createWithChildren(nodeKind, decl, sigOrDecl, type);
} else {
Expand Down
1 change: 1 addition & 0 deletions test/Demangle/Inputs/manglings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,4 +253,5 @@ _T010Foundation11MeasurementV12SimulatorKitSo9UnitAngleCRszlE11OrientationO2eeoi
_T04main1_yyF ---> main._() -> ()
_T04test6testitSiyt_tF ---> test.testit(()) -> Swift.Int
_T0Rml ---> _T0Rml
_T0Tk ---> _T0Tk