This is an archive of the discontinued LLVM Phabricator instance.

Differential D130937

[LLDB][NFC][Correctness] Fix bad null check
ClosedPublic

Authored by fixathon on Aug 1 2022, 1:50 PM.

Details

Reviewers
clayborg
aadsm
jingham
JDevlieghere
Commits
rG30b391119737: [LLDB][NFC][Correctness] Fix bad null check
Summary

Fix incorrect null-check logic, likely cause by copy-paste

Diff Detail

Event Timeline

fixathon created this revision.Aug 1 2022, 1:50 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 1 2022, 1:50 PM
Herald added a subscriber: emaste. · View Herald Transcript
fixathon requested review of this revision.Aug 1 2022, 1:50 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 1 2022, 1:50 PM
Herald added a subscriber: lldb-commits. · View Herald Transcript
Harbormaster completed remote builds in B178639: Diff 449116.Aug 1 2022, 1:53 PM
JDevlieghere accepted this revision.Aug 1 2022, 2:42 PM

LGTM

This revision is now accepted and ready to land.Aug 1 2022, 2:42 PM
Closed by commit rG30b391119737: [LLDB][NFC][Correctness] Fix bad null check (authored by fixathon). · Explain WhyAug 1 2022, 2:45 PM
This revision was automatically updated to reflect the committed changes.
fixathon added a commit: rG30b391119737: [LLDB][NFC][Correctness] Fix bad null check.

Revision Contents

PathSize
lldb/
source/
Plugins/
Process/
POSIX/
2 lines

Diff 449133

lldb/source/Plugins/Process/POSIX/NativeProcessELF.cpp

Show First 20 Lines • Show All 155 Lines • ▼ Show 20 Lines if (address == 0)
return llvm::createStringError(llvm::inconvertibleErrorCode(), return llvm::createStringError(llvm::inconvertibleErrorCode(),
"Invalid r_debug address"); "Invalid r_debug address");
// Read r_debug.r_map // Read r_debug.r_map
lldb::addr_t link_map = 0; lldb::addr_t link_map = 0;
status = ReadMemory(address + GetAddressByteSize(), &link_map, status = ReadMemory(address + GetAddressByteSize(), &link_map,
GetAddressByteSize(), bytes_read); GetAddressByteSize(), bytes_read);
if (!status.Success()) if (!status.Success())
return status.ToError(); return status.ToError();
if (address == 0) if (link_map == 0)
return llvm::createStringError(llvm::inconvertibleErrorCode(), return llvm::createStringError(llvm::inconvertibleErrorCode(),
"Invalid link_map address"); "Invalid link_map address");
std::vector<SVR4LibraryInfo> library_list; std::vector<SVR4LibraryInfo> library_list;
while (link_map) { while (link_map) {
llvm::Expected<SVR4LibraryInfo> info = llvm::Expected<SVR4LibraryInfo> info =
GetAddressByteSize() == 8 ? ReadSVR4LibraryInfo<uint64_t>(link_map) GetAddressByteSize() == 8 ? ReadSVR4LibraryInfo<uint64_t>(link_map)
: ReadSVR4LibraryInfo<uint32_t>(link_map); : ReadSVR4LibraryInfo<uint32_t>(link_map);
Show All 16 Lines