This is an archive of the discontinued LLVM Phabricator instance.

Differential D152962

[lldb] Fix SBPlatform after f4be9ff6458f
ClosedPublic

Authored by bulbazord on Jun 14 2023, 2:17 PM.

Details

Reviewers
jingham
mib
JDevlieghere
aprantl
Commits
rG623ad8a8ddc9: [lldb] Fix SBPlatform after f4be9ff6458f
Summary

If you pass nullptr (or None from python) to SBPlatform::SetSDKRoot,
LLDB crashes. Let's be more resilient to nullptr here.

Diff Detail

Event Timeline

bulbazord created this revision.Jun 14 2023, 2:17 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 14 2023, 2:17 PM
bulbazord requested review of this revision.Jun 14 2023, 2:17 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 14 2023, 2:17 PM
Herald added a subscriber: lldb-commits. · View Herald Transcript
bulbazord mentioned this in D152331: [lldb][NFCI] Platforms should own their SDKBuild and SDKRootDirectory strings.Jun 14 2023, 2:17 PM
Harbormaster completed remote builds in B238949: Diff 531512.Jun 14 2023, 2:20 PM
Herald added a subscriber: JDevlieghere. · View Herald TranscriptJun 14 2023, 2:20 PM
bulbazord added reviewers: mib, JDevlieghere, aprantl.Jun 14 2023, 2:57 PM
mib accepted this revision.Jun 14 2023, 3:32 PM
This revision is now accepted and ready to land.Jun 14 2023, 3:32 PM
Closed by commit rG623ad8a8ddc9: [lldb] Fix SBPlatform after f4be9ff6458f (authored by bulbazord). · Explain WhyJun 14 2023, 3:46 PM
This revision was automatically updated to reflect the committed changes.
bulbazord added a commit: rG623ad8a8ddc9: [lldb] Fix SBPlatform after f4be9ff6458f.

Revision Contents

PathSize
lldb/
source/
API/
2 lines

Diff 531512

lldb/source/API/SBPlatform.cpp

Show First 20 Lines • Show All 482 Lines • ▼ Show 20 Linesuint32_t SBPlatform::GetOSUpdateVersion() {
if (PlatformSP platform_sp = GetSP()) if (PlatformSP platform_sp = GetSP())
version = platform_sp->GetOSVersion(); version = platform_sp->GetOSVersion();
return version.getSubminor().value_or(UINT32_MAX); return version.getSubminor().value_or(UINT32_MAX);
} }
void SBPlatform::SetSDKRoot(const char *sysroot) { void SBPlatform::SetSDKRoot(const char *sysroot) {
LLDB_INSTRUMENT_VA(this, sysroot); LLDB_INSTRUMENT_VA(this, sysroot);
if (PlatformSP platform_sp = GetSP()) if (PlatformSP platform_sp = GetSP())
platform_sp->SetSDKRootDirectory(sysroot); platform_sp->SetSDKRootDirectory(llvm::StringRef(sysroot).str());
} }
SBError SBPlatform::Get(SBFileSpec &src, SBFileSpec &dst) { SBError SBPlatform::Get(SBFileSpec &src, SBFileSpec &dst) {
LLDB_INSTRUMENT_VA(this, src, dst); LLDB_INSTRUMENT_VA(this, src, dst);
SBError sb_error; SBError sb_error;
PlatformSP platform_sp(GetSP()); PlatformSP platform_sp(GetSP());
if (platform_sp) { if (platform_sp) {
▲ Show 20 Lines • Show All 158 Lines • Show Last 20 Lines