Skip to content

[DWARF] Fix crash in dwarf export with detached NTR vtable data variable #7653

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
emesare merged 1 commit into from
Nov 17, 2025
Merged

[DWARF] Fix crash in dwarf export with detached NTR vtable data variable #7653

Show file tree
Hide file tree
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
53 changes: 31 additions & 22 deletions plugins/dwarf/dwarf_export/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use gimli::{
UnitEntryId,
},
};
use log::{error, info, LevelFilter};
use log::{error, info, warn, LevelFilter};
use object::{write, Architecture, BinaryFormat, SectionKind};
use std::fs;
use std::path::{Path, PathBuf};
Expand Down Expand Up @@ -123,26 +123,35 @@ fn export_type(

for base_struct in ty_struct.base_structures() {
let inheritance_uid = dwarf.unit.add(structure_die_uid, gimli::DW_TAG_inheritance);
let base_struct_uid = export_type(
base_struct.ty.name().to_string(),
base_struct.ty.target(bv).unwrap().as_ref(),
bv,
defined_types,
dwarf,
)
.unwrap();
dwarf
.unit
.get_mut(inheritance_uid)
.set(gimli::DW_AT_type, AttributeValue::UnitRef(base_struct_uid));
dwarf.unit.get_mut(inheritance_uid).set(
gimli::DW_AT_data_member_location,
AttributeValue::Data8(base_struct.offset),
);
dwarf.unit.get_mut(inheritance_uid).set(
gimli::DW_AT_accessibility,
AttributeValue::Accessibility(gimli::DW_ACCESS_public),
);
if let Some(target_ty) = base_struct.ty.target(bv) {
let base_struct_uid = export_type(
base_struct.ty.name().to_string(),
&target_ty,
bv,
defined_types,
dwarf,
);

match base_struct_uid {
Some(uid) => {
dwarf
.unit
.get_mut(inheritance_uid)
.set(gimli::DW_AT_type, AttributeValue::UnitRef(uid));
dwarf.unit.get_mut(inheritance_uid).set(
gimli::DW_AT_data_member_location,
AttributeValue::Data8(base_struct.offset),
);
dwarf.unit.get_mut(inheritance_uid).set(
gimli::DW_AT_accessibility,
AttributeValue::Accessibility(gimli::DW_ACCESS_public),
);
}
None => {
log::warn!("Could not export base struct `{}`", base_struct.ty.name());
}
}
}
}

dwarf.unit.get_mut(structure_die_uid).set(
Expand Down Expand Up @@ -365,7 +374,7 @@ fn export_type(
Some(typedef_die_uid)
}
} else {
error!("Could not get target of typedef `{}`", ntr.name());
warn!("Could not get target of typedef `{}`", ntr.name());
None
}
}
Expand Down
12 changes: 7 additions & 5 deletions rust/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2080,13 +2080,13 @@ impl NamedTypeReference {
match ty.type_class() {
TypeClass::NamedTypeReferenceClass => {
// Recurse into the NTR type until we get the target type.
let ntr = ty.get_named_type_reference().unwrap();
let ntr = ty
.get_named_type_reference()
.expect("NTR type class should always have a valid NTR");
match visited.insert(ntr.id()) {
true => ntr.target_helper(bv, visited),
false => {
log::error!("Can't get target for recursively defined type!");
None
}
// Cyclic reference, return None.
false => None,
}
}
// Found target type
Expand All @@ -2095,6 +2095,8 @@ impl NamedTypeReference {
}

/// Type referenced by this [`NamedTypeReference`].
///
/// Will return `None` if the reference is cyclic, or the target type does not exist.
pub fn target(&self, bv: &BinaryView) -> Option<Ref<Type>> {
self.target_helper(bv, &mut HashSet::new())
}
Expand Down
Loading