Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-12 15:38:09 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixes the regressions with CL, working with handcrafted addrline info

Browse Source
This commit is contained in:
pancake 2016-12-22 12:49:33 +01:00
parent 66183063d4
commit 3a12dc4f23
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libr/bin/dbginfo.c
View File

@ -25,6 +25,23 @@ R_API char *r_bin_addr2text(RBin *bin, ut64 addr, int origin) {
char *out = NULL, *out2 = NULL;
char *file_nopath;
{
char *key = r_str_newf ("0x%"PFMT64x, addr);
char *file_line = sdb_get (bin->cur->sdb_addrinfo, key, 0);
if (file_line) {
char *token = strchr (file_line, '|');
if (token) {
*token ++ = 0;
int line = atoi (token);
out = r_file_slurp_line (file_line, line, 0);
}
free (file_line);
}
free (key);
if (out) {
return out;
}
}
file[0] = 0;
if (r_bin_addr2line (bin, addr, file, sizeof (file), &line)) {
if (bin->srcdir && *bin->srcdir) {

26
libr/core/cmd_meta.c
View File

@ -60,20 +60,19 @@ static int print_meta_fileline(RCore *core, const char *file_line) {
}
static int print_addrinfo (void *user, const char *k, const char *v) {
ut64 offset;
char *colonpos, *subst;
offset = sdb_atoi (v);
ut64 offset = sdb_atoi (k);
if (!offset) {
return true;
}
subst = strdup (k);
subst = strdup (v);
colonpos = strchr (subst, '|');
if (colonpos) {
*colonpos = ':';
}
r_cons_printf ("CL %s %s\n", subst, v);
r_cons_printf ("CL %s %s\n", subst, k);
free (subst);
return true;
@ -135,7 +134,9 @@ static int cmd_meta_lineinfo(RCore *core, const char *input) {
offset = r_num_math (core->num, p);
if (!offset)
offset = core->offset;
} else offset = core->offset;
} else {
offset = core->offset;
}
colon = strchr (p, ':');
if (colon) {
space = strchr (p, ' ');
@ -154,24 +155,25 @@ static int cmd_meta_lineinfo(RCore *core, const char *input) {
goto error;
}
*colon = '|';
while (*p != ' ') {
while (*p && *p != ' ') {
p++;
}
while (*p == ' ') {
p++;
}
if (*p != '\0') {
// TODO: use r_num_math here or something less rusty than sscanf
ret = sscanf (p, "0x%"PFMT64x, &offset);
if (ret != 1) {
remove = 0;
eprintf ("Failed to parse addr at %s\n", p);
// goto error;
} else {
ret = cmd_meta_add_fileline (core->bin->cur->sdb_addrinfo,
file_line, offset);
goto error;
}
ret = cmd_meta_add_fileline (core->bin->cur->sdb_addrinfo,
file_line, offset);
goto error;
}
if (remove) {
remove_meta_fileline (core, file_line);