Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-02 02:06:46 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix parse_debug_item in dex (#6381)

Browse Source
This commit is contained in:
Marc 2016-12-26 22:47:45 +01:00 committed by radare
parent b01de5310f
commit 83d8084602
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libr/bin/p/bin_dex.c
View File

@ -296,7 +296,7 @@ static void dex_parse_debug_item(RBinFile *binfile, RBinDexObj *bin,
ut64 line_start;
ut64 parameters_size;
ut64 param_type_idx;
ut16 argReg = regsz - ins_size; // ins_size or insns_size
ut16 argReg = regsz - ins_size;
RList *params, *debug_positions, *emitted_debug_locals = NULL;
bool keep = true;
if (argReg >= regsz) {
@ -344,8 +344,9 @@ static void dex_parse_debug_item(RBinFile *binfile, RBinDexObj *bin,
r_list_free (emitted_debug_locals);
return;
}
p4 = r_uleb128 (p4, p4_end - p4, &param_type_idx);
name = getstr (bin, bin->types[param_type_idx].descriptor_id);
p4 = r_uleb128 (p4, p4_end - p4, &param_type_idx); // read uleb128p1
param_type_idx -= 1;
name = getstr (bin, param_type_idx);
reg = argReg;
switch (type[0]) {
case 'D':
@ -546,13 +547,13 @@ static void dex_parse_debug_item(RBinFile *binfile, RBinDexObj *bin,
RListIter *iter2;
struct dex_debug_position_t *position;
rbin->cb_printf (" positions : \n");
rbin->cb_printf (" positions :\n");
r_list_foreach (debug_positions, iter2, position) {
rbin->cb_printf (" 0x%04llx line=%llu\n",
position->address, position->line);
}
rbin->cb_printf (" locals : \n");
rbin->cb_printf (" locals :\n");
RListIter *iter3;
struct dex_debug_local_t *local;
@ -565,7 +566,7 @@ static void dex_parse_debug_item(RBinFile *binfile, RBinDexObj *bin,
local->signature);
} else {
rbin->cb_printf (
" 0x%04x - 0x%04x reg=%d %s %s; \n",
" 0x%04x - 0x%04x reg=%d %s %s;\n",
local->startAddress, local->endAddress,
local->reg, local->name, local->descriptor);
}
@ -583,7 +584,7 @@ static void dex_parse_debug_item(RBinFile *binfile, RBinDexObj *bin,
debug_locals[reg].signature);
} else {
rbin->cb_printf (
" 0x%04x - 0x%04x reg=%d %s %s; "
" 0x%04x - 0x%04x reg=%d %s %s;"
"\n",
debug_locals[reg].startAddress,
insns_size, reg, debug_locals[reg].name,