Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-07 22:36:52 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixed findNextNumber and filter (#7161)

Browse Source
This commit is contained in:
Srimanta Barua 2017-03-27 23:13:56 +05:30 committed by radare
parent c1074d8e9d
commit eea0d7c494
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libr/parse/parse.c
View File

@ -148,8 +148,8 @@ static char *findNextNumber(char *op) {
char *t = p;
p++;
if (!IS_DIGIT (*p)) {
for (;*p && *p != ']'; p++);
if (*p == ']') {
for (;*t && *t != ']'; t++);
if (*t == ']') {
continue;
} else {
p = t;
@ -259,8 +259,9 @@ static int filter(RParse *p, RFlag *f, char *data, char *str, int len, bool big_
}
if (p->hint) {
int pnumleft, immbase = p->hint->immbase;
char num[256], *pnum;
char num[256], *pnum, *tmp;
bool is_hex = false;
int tmp_count;
strncpy (num, ptr, sizeof (num)-2);
pnum = num;
if (!strncmp (pnum, "0x", 2)) {
@ -283,6 +284,18 @@ static int filter(RParse *p, RFlag *f, char *data, char *str, int len, bool big_
strcat (num, "b");
break;
case 2: // hack for ascii
tmp_count = 0;
for (tmp = data; tmp < ptr; tmp++) {
if (*tmp == '[') {
tmp_count++;
} else if (*tmp == ']') {
tmp_count--;
}
}
if (tmp_count > 0) {
ptr = ptr2;
continue;
}
memset (num, 0, sizeof (num));
pnum = num;
*pnum++ = '\'';