mirror/libbacktrace
1
0
Fork 0
mirror of https://github.com/ianlancetaylor/libbacktrace.git synced 2026-04-05 17:09:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libbacktrace: don't special case file 0

Browse Source 
It's no longer necessary as file 0 is now set up in all cases.

	* dwarf.c (read_line_program): Don't special case file 0.
	(read_function_entry): Likewise.

Fixes #69
This commit is contained in:
Ian Lance Taylor
2021-03-02 18:14:55 -08:00
parent 59473f7906
commit 4f57c99971
1 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
dwarf.c
View File

@@ -3190,20 +3190,15 @@ read_line_program (struct backtrace_state *state, struct dwarf_data *ddata,
uint64_t fileno; uint64_t fileno;
fileno = read_uleb128 (line_buf); fileno = read_uleb128 (line_buf);
if (fileno == 0) if (fileno >= hdr->filenames_count)
filename = "";
else
{ {
if (fileno >= hdr->filenames_count) dwarf_buf_error (line_buf,
{ ("invalid file number in "
dwarf_buf_error (line_buf, "line number program"),
("invalid file number in " 0);
"line number program"), return 0;
0);
return 0;
}
filename = hdr->filenames[fileno];
} }
filename = hdr->filenames[fileno];
} }
break; break;
case DW_LNS_set_column: case DW_LNS_set_column:
@@ -3631,21 +3626,15 @@ read_function_entry (struct backtrace_state *state, struct dwarf_data *ddata,
case DW_AT_call_file: case DW_AT_call_file:
if (val.encoding == ATTR_VAL_UINT) if (val.encoding == ATTR_VAL_UINT)
{ {
if (val.u.uint == 0) if (val.u.uint >= lhdr->filenames_count)
function->caller_filename = "";
else
{ {
if (val.u.uint >= lhdr->filenames_count) dwarf_buf_error (unit_buf,
{ ("invalid file number in "
dwarf_buf_error (unit_buf, "DW_AT_call_file attribute"),
("invalid file number in " 0);
"DW_AT_call_file attribute"), return 0;
0);
return 0;
}
function->caller_filename =
lhdr->filenames[val.u.uint];
} }
function->caller_filename = lhdr->filenames[val.u.uint];
} }
break; break;