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

Dont demangle with libs unless requested ##bin (#18268)

Browse Source
This commit is contained in:
pancake 2021-01-22 15:53:24 +01:00 committed by GitHub
parent 5dedf4aa63
commit 2d2cef076c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libr/bin/demangle.c
View File

@ -64,7 +64,7 @@ R_API int r_bin_demangle_type(const char *str) {
R_API char *r_bin_demangle(RBinFile *bf, const char *def, const char *str, ut64 vaddr, bool libs) {
int type = -1;
if (!str || !*str) {
if (R_STR_ISEMPTY (str)) {
return NULL;
}
RBin *bin = bf? bf->rbin: NULL;
@ -80,7 +80,7 @@ R_API char *r_bin_demangle(RBinFile *bf, const char *def, const char *str, ut64
if (!strncmp (str, "imp.", 4)) {
str += 4;
}
if (o) {
if (o && libs) {
bool found = false;
r_list_foreach (o->libs, iter, lib) {
size_t len = strlen (lib);
@ -93,15 +93,14 @@ R_API char *r_bin_demangle(RBinFile *bf, const char *def, const char *str, ut64
break;
}
}
if (!found) {
lib = NULL;
}
size_t len = strlen (bin->file);
if (!r_str_ncasecmp (str, bin->file, len)) {
lib = bin->file;
str += len;
if (*str == '_') {
str++;
if (found) {
size_t len = strlen (bin->file);
if (!r_str_ncasecmp (str, bin->file, len)) {
lib = bin->file;
str += len;
if (*str == '_') {
str++;
}
}
}
}
@ -137,17 +136,3 @@ R_API char *r_bin_demangle(RBinFile *bf, const char *def, const char *str, ut64
}
return demangled;
}
#ifdef TEST
main() {
char *out, str[128];
strncpy (str, "_Z1hic", sizeof (str)-1);
strncpy (str, "main(Ljava/lang/String;I)V", sizeof (str)-1);
strncpy (str, "main([Ljava/lang/String;)V", sizeof (str)-1);
strncpy (str, "foo([III)Ljava/lang/Integer;", sizeof (str)-1);
//out = cplus_demangle_v3 (str, flags);
out = r_bin_demangle_java (str); //, flags);
printf ("INPUT (%s)\n", str);
printf ("OUTPUT (%s)\n", out);
}
#endif