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

Avoid infinite recursion on indirect self-references #836

Merged
merged 4 commits into from
May 7, 2024
Merged

Avoid infinite recursion on indirect self-references #836

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8cf2e00
bug fix
benjaminRomano May 1, 2024
8792018
fix mis-identification
benjaminRomano May 1, 2024
7a7be36
Use `if let` syntax
benjaminRomano May 2, 2024
e987585
Update CHANGELOG.md
benjaminRomano May 7, 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
18 changes: 16 additions & 2 deletions symbolic-debuginfo/src/dwarf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ impl<'d, 'a> UnitRef<'d, 'a> {
entry: &Die<'d, '_>,
language: Language,
bcsymbolmap: Option<&'d BcSymbolMap<'d>>,
prior_offset: Option<UnitOffset>,
) -> Result<Option<Name<'d>>, DwarfError> {
let mut attrs = entry.attrs();
let mut fallback_name = None;
Expand Down Expand Up @@ -452,8 +453,21 @@ impl<'d, 'a> UnitRef<'d, 'a> {

if let Some(attr) = reference_target {
return self.resolve_reference(attr, |ref_unit, ref_entry| {
// Self-references may have a layer of indircetion. Avoid infinite recursion
// in this scenario.
if let Some(prior) = prior_offset {
if self.offset() == ref_unit.offset() && prior == ref_entry.offset() {
return Ok(None);
}
}

if self.offset() != ref_unit.offset() || entry.offset() != ref_entry.offset() {
ref_unit.resolve_function_name(ref_entry, language, bcsymbolmap)
ref_unit.resolve_function_name(
ref_entry,
language,
bcsymbolmap,
Some(entry.offset()),
)
} else {
Ok(None)
}
Expand Down Expand Up @@ -714,7 +728,7 @@ impl<'d, 'a> DwarfUnit<'d, 'a> {
/// Resolves the name of a function from DWARF debug information.
fn resolve_dwarf_name(&self, entry: &Die<'d, '_>) -> Option<Name<'d>> {
self.inner
.resolve_function_name(entry, self.language, self.bcsymbolmap)
.resolve_function_name(entry, self.language, self.bcsymbolmap, None)
.ok()
.flatten()
}
Expand Down
Loading