8000 linux: dso_debug: move LinkMap name extraction into its own function by schopin-mozilla · Pull Request #231 · rust-minidump/minidump-writer · GitHub
[go: up one dir, main page]
Skip to content

linux: dso_debug: move LinkMap name extraction into its own function #231

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
schopin-mozilla merged 1 commit into from
Sep 17, 2026
Merged

linux: dso_debug: move LinkMap name extraction into its own function #231

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
35 changes: 25 additions & 10 deletions src/linux/dso_debug.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use {
minidump_format::*,
},
plain::Plain,
std::{ffi::OsString, os::unix::ffi::OsStringExt},
};

type Result<T> = std::result::Result<T, SectionDsoDebugError>;
Expand Down Expand Up @@ -79,6 +80,8 @@ pub enum RendezvousError {
UnexpectedDebuggerRendezvousVersion(i32),
#[error("failed reading link_map entry")]
ReadLinkMapEntryFailed(#[source] CopyFromProcessError),
#[error("failed reading the name a link_map entry points at")]
ReadModuleNameFailed(#[source] CopyFromProcessError),
#[error("invalid link entry")]
InvalidLinkEntry,
}
Expand Down Expand Up @@ -271,6 +274,27 @@ pub struct RDebug {
unsafe impl Plain for LinkMap {}
unsafe impl Plain for RDebug {}

impl LinkMap {
/// Copies that entry's file name out of the target.
pub(crate) fn name(&self, reader: &ProcessReader<'_>) -> RendezvousResult<OsString> {
if self.l_name == 0 {
return Ok(OsString::new());
}

let mut buf = Vec::new();
reader
.read_until(self.l_name, 0, &mut buf)
.map_err(RendezvousError::ReadModuleNameFailed)?;

// `read_until` includes the terminator it stopped on, if it found one.
if buf.last() == Some(&0) {
buf.pop();
}

Ok(OsString::from_vec(buf))
}
}

impl RDebug {
pub(crate) fn from_memory(
address: usize,
Expand Down Expand Up @@ -391,16 +415,7 @@ pub fn write_dso_debug_stream(

// Iterate over DSOs and write their information to mini dump
for (idx, map) in dso_vec.iter().enumerate() {
let mut filename = String::new();
if map.l_name > 0 {
let filename_data =
MinidumpWriter::copy_from_process(process_inspector, map.l_name, 256)?;

// C - string is NULL-terminated
if let Some(name) = filename_data.splitn(2, |x| *x == b'\0').next() {
filename = String::from_utf8(name.to_vec())?;
}
}
let filename = String::from_utf8(map.name(&memory_reader)?.into_vec())?;
let location = write_string_to_location(buffer, &filename)?;
let entry = MDRawLinkMap {
addr: map.l_addr as _,
Expand Down
Loading
0