Skip to content

Fix mac modules #42

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
Jake-Shadle merged 3 commits into from
Jul 14, 2022
Merged

Fix mac modules #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7aa1590
Actually make code do what the comment says
Jake-Shadle Jul 14, 2022
39f78e8
Make file path retrieval more lenient
Jake-Shadle Jul 14, 2022
9315547
Update CHANGELOG
Jake-Shadle Jul 14, 2022
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: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

<!-- next-header -->
## [Unreleased] - ReleaseDate
### Fixed
- [PR#42](https://github.com/rust-minidump/minidump-writer/pull/42) resolved [#41](https://github.com/rust-minidump/minidump-writer/issues/41) by capping the VM read of task memory to avoid a syscall failure, as well as made it so that if an error does occur when reading the module's file path, the module is still written to the minidump, as the file path is less important than the UUID.

## [0.2.1] - 2022-05-25
### Added
- [PR#32](https://github.com/rust-minidump/minidump-writer/pull/32) resolved [#23](https://github.com/rust-minidump/minidump-writer/issues/23) by adding support for the thread names stream on MacOS.
Expand Down
5 changes: 4 additions & 1 deletion src/mac/streams/module_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,10 @@ impl MinidumpWriter {
})?;

let file_path = if image.file_path != 0 {
dumper.read_string(image.file_path)?.unwrap_or_default()
dumper
.read_string(image.file_path)
.unwrap_or_default()
.unwrap_or_default()
} else {
String::new()
};
Expand Down
3 changes: 2 additions & 1 deletion src/mac/task_dumper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ impl TaskDumper {
};

if let Ok(size_to_end) = get_region_size() {
let mut bytes = self.read_task_memory(addr, size_to_end as usize)?;
let mut bytes =
self.read_task_memory(addr, std::cmp::min(size_to_end as usize, 8 * 1024))?;

// Find the null terminator and truncate our string
if let Some(null_pos) = bytes.iter().position(|c| *c == 0) {
Expand Down