Skip to content

Fix: decode DWARF line sequences with single program entry #5565

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
bcardiff merged 1 commit into from
Jan 10, 2018
Merged

Fix: decode DWARF line sequences with single program entry #5565

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
11 changes: 8 additions & 3 deletions src/debug/dwarf/line_numbers.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,11 @@ module Debug
@file_names = [{"", 0, 0, 0}]
@standard_opcode_lengths = [0_u8]
end

# Returns the unit length, adding the size of the `unit_length`.
def total_length
unit_length + sizeof(typeof(unit_length))
end
end

# Matrix of decompressed `Row` to search line number informations from the
Expand Down Expand Up @@ -230,14 +235,14 @@ module Debug
read_directory_table(sequence)
read_filename_table(sequence)

if @io.tell - @offset < sequence.offset + sequence.unit_length
if @io.tell - @offset < sequence.offset + sequence.total_length
read_statement_program(sequence)
end
end
end

private def read_opcodes(sequence)
1.upto(sequence.opcode_base - 1) do |i|
1.upto(sequence.opcode_base - 1) do
sequence.standard_opcode_lengths << @io.read_byte.not_nil!
end
end
Expand Down Expand Up @@ -296,7 +301,7 @@ module Debug
when LNE::EndSequence
registers.end_sequence = true
register_to_matrix(sequence, registers)
if (@io.tell - @offset - sequence.offset) < sequence.unit_length
if (@io.tell - @offset - sequence.offset) < sequence.total_length
registers = Register.new(sequence.default_is_stmt)
else
break
Expand Down