mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 02:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update libbacktrace to d0f5e95.

Browse Source
This commit is contained in:
Bartosz Taudul 2021-07-25 12:30:36 +02:00
parent d2b3182ab6
commit 6f855ebcd4
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
2 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libbacktrace/backtrace.hpp
View File

@ -53,13 +53,14 @@ struct backtrace_state;
invalid after this function returns. invalid after this function returns.
As a special case, the ERRNUM argument will be passed as -1 if no As a special case, the ERRNUM argument will be passed as -1 if no
debug info can be found for the executable, but the function debug info can be found for the executable, or if the debug info
requires debug info (e.g., backtrace_full, backtrace_pcinfo). The exists but has an unsupported version, but the function requires
MSG in this case will be something along the lines of "no debug debug info (e.g., backtrace_full, backtrace_pcinfo). The MSG in
info". Similarly, ERRNUM will be passed as -1 if there is no this case will be something along the lines of "no debug info".
symbol table, but the function requires a symbol table (e.g., Similarly, ERRNUM will be passed as -1 if there is no symbol table,
backtrace_syminfo). This may be used as a signal that some other but the function requires a symbol table (e.g., backtrace_syminfo).
approach should be tried. */ This may be used as a signal that some other approach should be
tried. */
typedef void (*backtrace_error_callback) (void *data, const char *msg, typedef void (*backtrace_error_callback) (void *data, const char *msg,
int errnum); int errnum);

89
libbacktrace/dwarf.cpp
View File

@ -746,13 +746,13 @@ struct dwarf_data
/* Report an error for a DWARF buffer. */ /* Report an error for a DWARF buffer. */
static void static void
dwarf_buf_error (struct dwarf_buf *buf, const char *msg) dwarf_buf_error (struct dwarf_buf *buf, const char *msg, int errnum)
{ {
char b[200]; char b[200];
snprintf (b, sizeof b, "%s in %s at %d", snprintf (b, sizeof b, "%s in %s at %d",
msg, buf->name, (int) (buf->buf - buf->start)); msg, buf->name, (int) (buf->buf - buf->start));
buf->error_callback (buf->data, b, 0); buf->error_callback (buf->data, b, errnum);
} }
/* Require at least COUNT bytes in BUF. Return 1 if all is well, 0 on /* Require at least COUNT bytes in BUF. Return 1 if all is well, 0 on
@ -766,7 +766,7 @@ require (struct dwarf_buf *buf, size_t count)
if (!buf->reported_underflow) if (!buf->reported_underflow)
{ {
dwarf_buf_error (buf, "DWARF underflow"); dwarf_buf_error (buf, "DWARF underflow", 0);
buf->reported_underflow = 1; buf->reported_underflow = 1;
} }
@ -928,7 +928,7 @@ read_address (struct dwarf_buf *buf, int addrsize)
case 8: case 8:
return read_uint64 (buf); return read_uint64 (buf);
default: default:
dwarf_buf_error (buf, "unrecognized address size"); dwarf_buf_error (buf, "unrecognized address size", 0);
return 0; return 0;
} }
} }
@ -979,7 +979,7 @@ read_uleb128 (struct dwarf_buf *buf)
ret |= ((uint64_t) (b & 0x7f)) << shift; ret |= ((uint64_t) (b & 0x7f)) << shift;
else if (!overflow) else if (!overflow)
{ {
dwarf_buf_error (buf, "LEB128 overflows uint64_t"); dwarf_buf_error (buf, "LEB128 overflows uint64_t", 0);
overflow = 1; overflow = 1;
} }
shift += 7; shift += 7;
@ -1014,7 +1014,7 @@ read_sleb128 (struct dwarf_buf *buf)
val |= ((uint64_t) (b & 0x7f)) << shift; val |= ((uint64_t) (b & 0x7f)) << shift;
else if (!overflow) else if (!overflow)
{ {
dwarf_buf_error (buf, "signed LEB128 overflows uint64_t"); dwarf_buf_error (buf, "signed LEB128 overflows uint64_t", 0);
overflow = 1; overflow = 1;
} }
shift += 7; shift += 7;
@ -1154,7 +1154,7 @@ read_attribute (enum dwarf_form form, uint64_t implicit_val,
offset = read_offset (buf, is_dwarf64); offset = read_offset (buf, is_dwarf64);
if (offset >= dwarf_sections->size[DEBUG_STR]) if (offset >= dwarf_sections->size[DEBUG_STR])
{ {
dwarf_buf_error (buf, "DW_FORM_strp out of range"); dwarf_buf_error (buf, "DW_FORM_strp out of range", 0);
return 0; return 0;
} }
val->encoding = ATTR_VAL_STRING; val->encoding = ATTR_VAL_STRING;
@ -1169,7 +1169,7 @@ read_attribute (enum dwarf_form form, uint64_t implicit_val,
offset = read_offset (buf, is_dwarf64); offset = read_offset (buf, is_dwarf64);
if (offset >= dwarf_sections->size[DEBUG_LINE_STR]) if (offset >= dwarf_sections->size[DEBUG_LINE_STR])
{ {
dwarf_buf_error (buf, "DW_FORM_line_strp out of range"); dwarf_buf_error (buf, "DW_FORM_line_strp out of range", 0);
return 0; return 0;
} }
val->encoding = ATTR_VAL_STRING; val->encoding = ATTR_VAL_STRING;
@ -1216,7 +1216,8 @@ read_attribute (enum dwarf_form form, uint64_t implicit_val,
if (form == DW_FORM_implicit_const) if (form == DW_FORM_implicit_const)
{ {
dwarf_buf_error (buf, dwarf_buf_error (buf,
"DW_FORM_indirect to DW_FORM_implicit_const"); "DW_FORM_indirect to DW_FORM_implicit_const",
0);
return 0; return 0;
} }
return read_attribute ((enum dwarf_form) form, 0, buf, is_dwarf64, return read_attribute ((enum dwarf_form) form, 0, buf, is_dwarf64,
@ -1349,7 +1350,7 @@ read_attribute (enum dwarf_form form, uint64_t implicit_val,
} }
if (offset >= altlink->dwarf_sections.size[DEBUG_STR]) if (offset >= altlink->dwarf_sections.size[DEBUG_STR])
{ {
dwarf_buf_error (buf, "DW_FORM_strp_sup out of range"); dwarf_buf_error (buf, "DW_FORM_strp_sup out of range", 0);
return 0; return 0;
} }
val->encoding = ATTR_VAL_STRING; val->encoding = ATTR_VAL_STRING;
@ -1358,7 +1359,7 @@ read_attribute (enum dwarf_form form, uint64_t implicit_val,
return 1; return 1;
} }
default: default:
dwarf_buf_error (buf, "unrecognized DWARF form"); dwarf_buf_error (buf, "unrecognized DWARF form", -1);
return 0; return 0;
} }
} }
@ -1407,7 +1408,9 @@ resolve_string (const struct dwarf_sections *dwarf_sections, int is_dwarf64,
offset = read_offset (&offset_buf, is_dwarf64); offset = read_offset (&offset_buf, is_dwarf64);
if (offset >= dwarf_sections->size[DEBUG_STR]) if (offset >= dwarf_sections->size[DEBUG_STR])
{ {
dwarf_buf_error (&offset_buf, "DW_FORM_strx offset out of range"); dwarf_buf_error (&offset_buf,
"DW_FORM_strx offset out of range",
0);
return 0; return 0;
} }
*string = (const char *) dwarf_sections->data[DEBUG_STR] + offset; *string = (const char *) dwarf_sections->data[DEBUG_STR] + offset;
@ -2215,7 +2218,7 @@ add_ranges_from_rnglists (
break; break;
default: default:
dwarf_buf_error (&rnglists_buf, "unrecognized DW_RLE value"); dwarf_buf_error (&rnglists_buf, "unrecognized DW_RLE value", -1);
return 0; return 0;
} }
} }
@ -2482,7 +2485,7 @@ build_address_map (struct backtrace_state *state, uintptr_t base_address,
version = read_uint16 (&unit_buf); version = read_uint16 (&unit_buf);
if (version < 2 || version > 5) if (version < 2 || version > 5)
{ {
dwarf_buf_error (&unit_buf, "unrecognized DWARF version"); dwarf_buf_error (&unit_buf, "unrecognized DWARF version", -1);
goto fail; goto fail;
} }
@ -2761,7 +2764,8 @@ read_v2_paths (struct backtrace_state *state, struct unit *u,
{ {
dwarf_buf_error (hdr_buf, dwarf_buf_error (hdr_buf,
("invalid directory index in " ("invalid directory index in "
"line number program header")); "line number program header"),
0);
return 0; return 0;
} }
dir_len = strlen (dir); dir_len = strlen (dir);
@ -2830,7 +2834,8 @@ read_lnct (struct backtrace_state *state, struct dwarf_data *ddata,
{ {
dwarf_buf_error (hdr_buf, dwarf_buf_error (hdr_buf,
("invalid directory index in " ("invalid directory index in "
"line number program header")); "line number program header"),
0);
return 0; return 0;
} }
dir = hdr->dirs[val.u.uint]; dir = hdr->dirs[val.u.uint];
@ -2845,7 +2850,8 @@ read_lnct (struct backtrace_state *state, struct dwarf_data *ddata,
if (path == NULL) if (path == NULL)
{ {
dwarf_buf_error (hdr_buf, dwarf_buf_error (hdr_buf,
"missing file name in line number program header"); "missing file name in line number program header",
0);
return 0; return 0;
} }
@ -2972,7 +2978,7 @@ read_line_header (struct backtrace_state *state, struct dwarf_data *ddata,
hdr->version = read_uint16 (line_buf); hdr->version = read_uint16 (line_buf);
if (hdr->version < 2 || hdr->version > 5) if (hdr->version < 2 || hdr->version > 5)
{ {
dwarf_buf_error (line_buf, "unsupported line number version"); dwarf_buf_error (line_buf, "unsupported line number version", -1);
return 0; return 0;
} }
@ -2986,7 +2992,8 @@ read_line_header (struct backtrace_state *state, struct dwarf_data *ddata,
if (read_byte (line_buf) != 0) if (read_byte (line_buf) != 0)
{ {
dwarf_buf_error (line_buf, dwarf_buf_error (line_buf,
"non-zero segment_selector_size not supported"); "non-zero segment_selector_size not supported",
-1);
return 0; return 0;
} }
} }
@ -3127,7 +3134,8 @@ read_line_program (struct backtrace_state *state, struct dwarf_data *ddata,
{ {
dwarf_buf_error (line_buf, dwarf_buf_error (line_buf,
("invalid directory index " ("invalid directory index "
"in line number program")); "in line number program"),
0);
return 0; return 0;
} }
dir_len = strlen (dir); dir_len = strlen (dir);
@ -3185,19 +3193,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;
return 0;
}
filename = hdr->filenames[fileno];
} }
filename = hdr->filenames[fileno];
} }
break; break;
case DW_LNS_set_column: case DW_LNS_set_column:
@ -3428,7 +3432,9 @@ read_referenced_name (struct dwarf_data *ddata, struct unit *u,
code = read_uleb128 (&unit_buf); code = read_uleb128 (&unit_buf);
if (code == 0) if (code == 0)
{ {
dwarf_buf_error (&unit_buf, "invalid abstract origin or specification"); dwarf_buf_error (&unit_buf,
"invalid abstract origin or specification",
0);
return NULL; return NULL;
} }
@ -3623,20 +3629,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;
return 0;
}
function->caller_filename =
lhdr->filenames[val.u.uint];
} }
function->caller_filename = lhdr->filenames[val.u.uint];
} }
break; break;