[lldb] Don't crash on malformed filesets #98388
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The memory read can fail for a malformed fileset. Handle it gracefully instead of passing a nullptr to the std::string constructor. rdar://131477833
|
@llvm/pr-subscribers-lldb Author: Jonas Devlieghere (JDevlieghere) ChangesThe memory read can fail for a malformed fileset. Handle it gracefully instead of passing a nullptr to the std::string constructor. rdar://131477833 Full diff: https://github.com/llvm/llvm-project/pull/98388.diff 1 Files Affected:
diff --git a/lldb/source/Plugins/ObjectContainer/Mach-O-Fileset/ObjectContainerMachOFileset.cpp b/lldb/source/Plugins/ObjectContainer/Mach-O-Fileset/ObjectContainerMachOFileset.cpp
index 2dc71d85777ca..76141f7976413 100644
--- a/lldb/source/Plugins/ObjectContainer/Mach-O-Fileset/ObjectContainerMachOFileset.cpp
+++ b/lldb/source/Plugins/ObjectContainer/Mach-O-Fileset/ObjectContainerMachOFileset.cpp
@@ -159,9 +159,9 @@ ParseFileset(DataExtractor &data, mach_header header,
fileset_entry_command entry;
data.CopyData(load_cmd_offset, sizeof(fileset_entry_command), &entry);
lldb::offset_t entry_id_offset = load_cmd_offset + entry.entry_id.offset;
- const char *id = data.GetCStr(&entry_id_offset);
- entries.emplace_back(entry.vmaddr + slide, entry.fileoff,
- std::string(id));
+ if (const char *id = data.GetCStr(&entry_id_offset))
+ entries.emplace_back(entry.vmaddr + slide, entry.fileoff,
+ std::string(id));
}
offset = load_cmd_offset + lc.cmdsize;
|
jasonmolenda
approved these changes
Jul 10, 2024
JDevlieghere
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Jul 12, 2024
The memory read can fail for a malformed fileset. Handle it gracefully instead of passing a nullptr to the std::string constructor. rdar://131477833 (cherry picked from commit 919caa8)
aaryanshukla
pushed a commit
to aaryanshukla/llvm-project
that referenced
this pull request
Jul 14, 2024
The memory read can fail for a malformed fileset. Handle it gracefully instead of passing a nullptr to the std::string constructor. rdar://131477833
JDevlieghere
added a commit
to swiftlang/llvm-project
that referenced
this pull request
Jul 15, 2024
[lldb] Don't crash on malformed filesets (llvm#98388)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The memory read can fail for a malformed fileset. Handle it gracefully instead of passing a nullptr to the std::string constructor.
rdar://131477833