Skip to content
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

Fix read error on objects with no .text section #67

Merged
merged 4 commits into from
Jun 4, 2024
Merged

Fix read error on objects with no .text section #67

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd9b5ef
Fix read error on objects with no .text section
AetiasHax May 26, 2024
a2e4fe0
Fix read error on DWARF 1.1 objects
AetiasHax May 26, 2024
8f1fe1e
Revert DWARF 1 changes
encounter Jun 4, 2024
17efb16
Merge branch 'main' into no-text
encounter Jun 4, 2024
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
13 changes: 4 additions & 9 deletions objdiff-core/src/obj/read.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,15 +328,10 @@ fn line_info(obj_file: &File<'_>, sections: &mut [ObjSection]) -> Result<()> {
if let Some(program) = unit.line_program.clone() {
let mut text_sections =
obj_file.sections().filter(|s| s.kind() == SectionKind::Text);
let section_index = text_sections
.next()
.ok_or_else(|| anyhow!("Next text section not found for line info"))?
.index()
.0;
let mut lines = sections
.iter_mut()
.find(|s| s.orig_index == section_index)
.map(|s| &mut s.line_info);
let section_index = text_sections.next().map(|s| s.index().0);
let mut lines = section_index.map(|index| {
&mut sections.iter_mut().find(|s| s.orig_index == index).unwrap().line_info
});

let mut rows = program.rows();
while let Some((_header, row)) = rows.next_row()? {
Expand Down