RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 13:57:35 +00:00
Code Issues Activity Actions

LibDebug: Tolerate missing debug information

Browse source 
We previously crashed when programs were missing certain debug information.
This commit is contained in:
Itamar 2020-05-23 14:55:39 +03:00 • committed by Andreas Kling
parent 58480a510f
commit 2686957836
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Libraries/LibDebug/DebugInfo.cpp
View file

@ -69,6 +69,10 @@ void DebugInfo::parse_scopes_impl(const Dwarf::DIE& die)
if (name.has_value()) if (name.has_value())
scope.name = name.value().data.as_string; scope.name = name.value().data.as_string;
if (!child.get_attribute(Dwarf::Attribute::LowPc).has_value()) {
dbg() << "DWARF: Couldn't find attribtue LowPc for scope";
return;
}
scope.address_low = child.get_attribute(Dwarf::Attribute::LowPc).value().data.as_u32; scope.address_low = child.get_attribute(Dwarf::Attribute::LowPc).value().data.as_u32;
// The attribute name HighPc is confusing. In this context, it seems to actually be a positive offset from LowPc // The attribute name HighPc is confusing. In this context, it seems to actually be a positive offset from LowPc
scope.address_high = scope.address_low + child.get_attribute(Dwarf::Attribute::HighPc).value().data.as_u32; scope.address_high = scope.address_low + child.get_attribute(Dwarf::Attribute::HighPc).value().data.as_u32;
@ -88,9 +92,10 @@ void DebugInfo::parse_scopes_impl(const Dwarf::DIE& die)
void DebugInfo::prepare_lines() void DebugInfo::prepare_lines()
{ {
auto section = m_elf->image().lookup_section(".debug_line"); auto section = m_elf->image().lookup_section(".debug_line");
ASSERT(!section.is_undefined()); if (section.is_undefined())
return;
auto buffer = ByteBuffer::wrap(reinterpret_cast<const u8*>(section.raw_data()), section.size()); auto buffer = section.wrapping_byte_buffer();
BufferStream stream(buffer); BufferStream stream(buffer);
Vector<LineProgram::LineInfo> all_lines; Vector<LineProgram::LineInfo> all_lines;

5
Libraries/LibDebug/Dwarf/DwarfInfo.cpp
View file

@ -41,12 +41,15 @@ DwarfInfo::DwarfInfo(NonnullRefPtr<const ELF::Loader> elf)
ByteBuffer DwarfInfo::section_data(const String& section_name) ByteBuffer DwarfInfo::section_data(const String& section_name)
{ {
auto section = m_elf->image().lookup_section(section_name); auto section = m_elf->image().lookup_section(section_name);
ASSERT(!section.is_undefined()); if (section.is_undefined())
return {};
return section.wrapping_byte_buffer(); return section.wrapping_byte_buffer();
} }
void DwarfInfo::populate_compilation_units() void DwarfInfo::populate_compilation_units()
{ {
if (m_debug_info_data.is_null())
return;
// We have to const_cast here because there isn't a version of // We have to const_cast here because there isn't a version of
// BufferStream that accepts a const ByteStream // BufferStream that accepts a const ByteStream
// We take care not to use BufferStream operations that modify the underlying buffer // We take care not to use BufferStream operations that modify the underlying buffer