Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-22 05:37:06 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix for issue #3766

Browse Source
This commit is contained in:
DZ_ruyk 2016-01-06 03:47:54 +03:00 committed by pancake
parent 8686a35ab7
commit 010e997c3e
2 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libr/parse/parse.c
View File

@ -193,15 +193,18 @@ static int filter(RParse *p, RFlag *f, char *data, char *str, int len) {
}
if (p->hint) {
int immbase = p->hint->immbase;
char num[256], *n;
int endian = 0;
char num[256], *pnum;
strncpy (num, ptr, sizeof (num)-2);
for (n = num; *n; n++) {
if (IS_NUMBER (*n))
for (pnum = num; *pnum; pnum++) {
if (IS_NUMBER (*pnum))
continue;
if (*n=='x') continue;
if (*pnum=='x') continue;
break;
}
*n = 0;
*pnum = 0;
if (p->anal && p->anal->big_endian)
endian = 1;
switch (immbase) {
case 0:
// do nothing
@ -211,7 +214,40 @@ static int filter(RParse *p, RFlag *f, char *data, char *str, int len) {
strcat (num, "b");
break;
case 2: // hack for ascii
snprintf (num, sizeof (num), "'%c'", (char)off);
memset(num, 0, sizeof(num));
pnum = num;
*pnum++ = '\'';
// Convert *off* to ascii string, byte by byte.
// Since *num* is 256 bytes long, we can omit
// overflow checks.
while (off) {
unsigned char ch;
if (endian) {
ch = off >> (8 * (sizeof(off) - 1));
off <<= 8;
} else {
ch = off & 0xff;
off >>= 8;
}
//Skip first '\x00' bytes
if (num[1] == '\0' && ch == '\0') continue;
if (IS_PRINTABLE(ch)) {
*pnum++ = ch;
} else {
int sz;
sz = sprintf(pnum, "\\x%2.2x", ch);
if (sz < 0) break;
pnum += sz;
}
}
*pnum++ = '\'';
*pnum = '\0';
break;
case 8:
snprintf (num, sizeof (num), "0%o", (int)off);

2
libr/util/hex.c
View File

@ -4,7 +4,7 @@
#include "r_util.h"
#include <stdio.h>
/* int c; ret = hex_to_byet(&c, 'c'); */
/* int c; ret = hex_to_byte(&c, 'c'); */
R_API int r_hex_to_byte(ut8 *val, ut8 c) {
if ('0' <= c && c <= '9') *val = (ut8)(*val) * 16 + (c-'0');
else if (c >= 'A' && c <= 'F') *val = (ut8)(*val) * 16 + (c-'A'+10);