DeDRM/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2026-05-29 08:29:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

Guard large id* scripts, reduce dwarf memory usage more and fix ^C trap ##bin

Browse Source
This commit is contained in:
pancake
2026-05-05 17:07:29 +02:00
parent e02ef73603
commit e3054b0c5f
2 changed files with 98 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
libr/bin/dwarf.c
View File

@@ -769,13 +769,21 @@ static const char *get_section_string(RBinFile *bf, RBinSection *section, size_t
return NULL;
}
const ut8 *data = get_section_bytes (bf, section);
if (!data || offset >= section->size) {
size_t len = section->bytes.len;
if (!data || offset >= len) {
return NULL;
}
if (!memchr (data + offset, 0, len - offset)) {
return NULL;
}
return (const char *) (data + offset);
}
static bool dwarf_is_breaked(RBin *bin) {
return bin && bin->consb.is_breaked && bin->consb.is_breaked (bin->consb.cons);
}
typedef struct entry_descriptor {
ut64 type;
ut64 form;
@@ -895,12 +903,17 @@ static const ut8 *str_form_value(RBinFile *bf, entry_descriptor desc, const ut8
if (buf == NULL || buf >= buf_end) {
return NULL;
}
const int len = R_MIN (maxlen, (buf_end - buf));
if (len < 0) {
size_t available = buf_end - buf;
size_t len = R_MIN (maxlen, available);
if (len > ST32_MAX) {
return NULL;
}
size_t slen = r_str_nlen ((const char *)buf, (int)len);
if (slen >= len) {
return NULL;
}
*ret_name = (const char *)buf;
buf += strnlen (*ret_name, len) + 1;
buf += slen + 1;
return buf;
default:
R_LOG_DEBUG ("Expected form type string but got: %#x", desc.form);
@@ -1565,7 +1578,7 @@ static size_t parse_opcodes(RBin *bin, const ut8 *obuf, size_t len, const RBinDw
const ut8 *buf = obuf;
const ut8 *buf_end = obuf + len;
while (buf && buf + 1 < buf_end) {
while (buf && buf + 1 < buf_end && !dwarf_is_breaked (bin)) {
opcode = *buf++;
len--;
if (!opcode) {
@@ -1607,7 +1620,7 @@ static bool parse_line_raw(RBin *a, const ut8 *obuf, ut64 len, int mode) {
ut64 buf_size;
// each iteration we read one header AKA comp. unit
while (buf && buf + 4 < buf_end) {
while (buf && buf + 4 < buf_end && !dwarf_is_breaked (a)) {
// How much did we read from the compilation unit
size_t bytes_read = 0;
// calculate how much we've read by parsing header
@@ -1657,9 +1670,13 @@ static bool parse_line_raw(RBin *a, const ut8 *obuf, ut64 len, int mode) {
do {
// reads one whole sequence
tmp_read = parse_opcodes (a, buf, buf_end - buf, &hdr, &regs, mode);
if (dwarf_is_breaked (a)) {
line_header_fini (&hdr);
return true;
}
bytes_read += tmp_read;
buf += tmp_read; // Move in the buffer forward
} while (bytes_read < buf_size && tmp_read != 0); // if nothing is read -> error, exit
} while (bytes_read < buf_size && tmp_read != 0 && !dwarf_is_breaked (a)); // if nothing is read -> error, exit
if (!tmp_read) {
line_header_fini (&hdr);
@@ -1994,7 +2011,7 @@ static void print_attr_value(const RBinDwarfAttrValue *val, PrintfCallback print
case DW_FORM_strp:
print ("(indirect string, offset: 0x%" PFMT64x "): %s",
val->string.offset,
val->string.content);
r_str_get_fail (val->string.content, "(null)"));
break;
case DW_FORM_addr:
case DW_FORM_addrx:
@@ -2163,15 +2180,21 @@ static const ut8 *parse_attr_value(RBinFile *bf, const ut8 *obuf, int obuf_len,
break;
case DW_FORM_string:
value->kind = DW_AT_KIND_STRING;
if (*buf) {
size_t available = buf_end - buf;
if (available < 1 || available > ST32_MAX) {
return NULL;
}
size_t slen = r_str_nlen ((const char *)buf, (int)available);
if (slen >= available) {
return NULL;
}
if (slen > 0) {
// go programs contain multibyte chars in the symbol names and strings we dont want to strip them here
value->string.content = (const char *)buf;
} else {
value->string.content = NULL;
}
if (value->string.content) {
buf += strlen (value->string.content) + 1;
}
buf += slen + 1;
break;
case DW_FORM_block1:
value->kind = DW_AT_KIND_BLOCK;
@@ -2789,10 +2812,14 @@ R_API RList *r_bin_dwarf_parse_comp_unit_files(RBinFile *bf, RVecDwarfAbbrevDecl
static bool print_die_stream(RBinFile *bf, const ut8 **pbuf, const ut8 *buf_start, const ut8 *buf_end, RBinDwarfCompUnitHdr *hdr, RVecDwarfAbbrevDecl *decls, size_t first_abbr_idx, PrintfCallback print) {
const ut8 *buf = *pbuf;
RBin *bin = bf? bf->rbin: NULL;
size_t abbrevs_count = RVecDwarfAbbrevDecl_length (decls);
size_t len_size = hdr->is_64bit? 12: 4;
ut64 die_offset = buf - buf_start + hdr->header_size + hdr->unit_offset + len_size;
ut64 abbr_code = 0;
if (dwarf_is_breaked (bin)) {
return false;
}
buf = r_uleb128 (buf, buf_end - buf, &abbr_code, NULL);
if (!buf) {
return false;
@@ -2827,6 +2854,9 @@ static bool print_die_stream(RBinFile *bf, const ut8 **pbuf, const ut8 *buf_star
const char *comp_dir = NULL;
RBinDwarfAttrDef *def;
R_VEC_FOREACH (abbrev->defs, def) {
if (dwarf_is_breaked (bin)) {
return false;
}
if (!def->attr_name && !def->attr_form) {
break;
}
@@ -2876,7 +2906,7 @@ R_API bool r_bin_dwarf_print_info(RBinFile *bf, RVecDwarfAbbrevDecl *decls) {
const ut8 *buf = obuf;
const ut8 *buf_end = obuf + section->bytes.len;
size_t abbrevs_count = RVecDwarfAbbrevDecl_length (decls);
while (buf && buf + 4 < buf_end) {
while (buf && buf + 4 < buf_end && !dwarf_is_breaked (bin)) {
RBinDwarfCompUnitHdr hdr = { 0 };
const ut8 *unit_start = buf;
hdr.unit_offset = unit_start - obuf;
@@ -2909,7 +2939,7 @@ R_API bool r_bin_dwarf_print_info(RBinFile *bf, RVecDwarfAbbrevDecl *decls) {
print ("\n");
const ut8 *unit_data = buf;
while (buf && buf < unit_end) {
while (buf && buf < unit_end && !dwarf_is_breaked (bin)) {
if (!print_die_stream (bf, &buf, unit_data, unit_end, &hdr, decls, first_abbr_idx, print)) {
return false;
}
@@ -3461,7 +3491,7 @@ R_API bool r_bin_dwarf_print_loc_stream(RBinFile *bf, int addr_size) {
bool have_list = false;
print ("\nContents of the .debug_loc section:\n");
while (buf && buf < buf_end) {
while (buf && buf < buf_end && !dwarf_is_breaked (bin)) {
if (buf + 2 * addr_size > buf_end) {
break;
}
@@ -3496,6 +3526,10 @@ R_API bool r_bin_dwarf_print_loc_stream(RBinFile *bf, int addr_size) {
base_offset, start_addr + address_base, end_addr + address_base);
base_offset += addr_size * 2 + 2 + block_len;
}
if (dwarf_is_breaked (bin)) {
print ("\n");
return false;
}
if (have_list) {
print ("0x%" PFMT64x " <End of list>\n", base_offset);
}

53
libr/core/cbin.c
View File

@@ -1160,6 +1160,10 @@ static void bin_addrline_warn_large_dwarf(RBinFile *bf, bool skipped) {
}
}
static bool bin_addrline_is_script_mode(int mode) {
return mode == '*' || (mode & R_MODE_RADARE);
}
typedef struct {
bool enabled;
bool flush;
@@ -1198,6 +1202,22 @@ static void bin_cons_stream_end(RCore *core, BinConsStreamState *state) {
state->enabled = false;
}
static void bin_addrline_break_begin(RCore *core, bool *state) {
if (!state || *state || !core || !core->cons) {
return;
}
r_cons_break_push (core->cons, NULL, NULL);
*state = true;
}
static void bin_addrline_break_end(RCore *core, bool *state) {
if (!state || !*state || !core || !core->cons) {
return;
}
r_cons_break_pop (core->cons);
*state = false;
}
static bool bin_addrline_maybe(RCore *core, PJ *pj, int mode, bool allow_large) {
RBinAddrline *row;
RListIter *iter;
@@ -1221,6 +1241,7 @@ static bool bin_addrline_maybe(RCore *core, PJ *pj, int mode, bool allow_large)
RList *list = NULL;
RList *ownlist = NULL;
BinConsStreamState stream_state = { 0 };
bool parser_break_pushed = false;
if (plugin && plugin->lines) {
// list is not cloned to improve speed. avoid use after free
list = plugin->lines (bf);
@@ -1230,28 +1251,52 @@ static bool bin_addrline_maybe(RCore *core, PJ *pj, int mode, bool allow_large)
bin_addrline_warn_large_dwarf (bf, true);
return true;
}
if (large_dwarf && bin_addrline_is_script_mode (mode)) {
const char *section_name = NULL;
ut64 section_size = 0;
bin_addrline_is_large_dwarf (bf, &section_name, &section_size);
R_LOG_WARN ("Skipping DWARF addrline script for large %s section (%" PFMT64u "MB). "
"`id*` would emit a very large command stream; use `idx` for source files "
"or `id` when a full debug dump is really needed",
r_str_get (section_name), section_size / (1024 * 1024));
if (IS_MODE_JSON (mode)) {
pj_end (pj);
}
return true;
}
if (allow_large || mode == R_MODE_PRINT) {
bin_addrline_warn_large_dwarf (bf, false);
}
if (mode == R_MODE_PRINT && large_dwarf) {
R_LOG_WARN ("Streaming large DWARF debug dump directly to the console to avoid buffering several GB of output");
bin_cons_stream_begin (core, &stream_state);
bin_addrline_break_begin (core, &parser_break_pushed);
}
RVecDwarfAbbrevDecl *da = r_bin_dwarf_parse_abbrev (bf, mode);
if (da) {
if (mode == R_MODE_PRINT) {
r_bin_dwarf_print_info (bf, da);
r_bin_dwarf_print_loc_stream (bf, core->anal->config->bits / 8);
r_bin_dwarf_parse_aranges (bf, mode);
if (!r_cons_is_breaked (core->cons)) {
r_bin_dwarf_print_info (bf, da);
}
if (!r_cons_is_breaked (core->cons)) {
r_bin_dwarf_print_loc_stream (bf, core->anal->config->bits / 8);
}
if (!r_cons_is_breaked (core->cons)) {
r_bin_dwarf_parse_aranges (bf, mode);
}
} else {
r_bin_dwarf_parse_comp_dirs (bf, da);
}
r_bin_dwarf_free_debug_abbrev (da);
}
list = ownlist = r_bin_dwarf_parse_line (bf, mode);
if (!r_cons_is_breaked (core->cons)) {
list = ownlist = r_bin_dwarf_parse_line (bf, mode);
}
bin_addrline_break_end (core, &parser_break_pushed);
bin_cons_stream_end (core, &stream_state);
}
if (!list) {
bin_addrline_break_end (core, &parser_break_pushed);
bin_cons_stream_end (core, &stream_state);
if (IS_MODE_JSON (mode)) {
pj_end (pj);