Skip to content
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

[clang][dataflow] Reorder checks to protect against a null pointer dereference. #66764

Merged
merged 1 commit into from
Sep 20, 2023
Merged

[clang][dataflow] Reorder checks to protect against a null pointer dereference. #66764

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
13 changes: 7 additions & 6 deletions clang/lib/Analysis/FlowSensitive/Transfer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,17 +531,18 @@ class TransferVisitor : public ConstStmtVisitor<TransferVisitor> {
auto *LocDst =
cast_or_null<RecordStorageLocation>(Env.getStorageLocation(*Arg0));

if (LocSrc == nullptr || LocDst == nullptr)
return;

// The assignment operators are different from the type of the destination
// in this model (i.e. in one of their base classes). This must be very rare
// and we just bail.
// in this model (i.e. in one of their base classes). This must be very
// rare and we just bail.
if (Method->getThisObjectType().getCanonicalType().getUnqualifiedType() !=
LocDst->getType().getCanonicalType().getUnqualifiedType())
return;

if (LocSrc != nullptr && LocDst != nullptr) {
copyRecord(*LocSrc, *LocDst, Env);
Env.setStorageLocation(*S, *LocDst);
}
copyRecord(*LocSrc, *LocDst, Env);
Env.setStorageLocation(*S, *LocDst);
}
}

Expand Down