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

Fix r_num_is_float()

Browse Source
This commit is contained in:
pancake 2016-11-13 22:12:19 +01:00
parent e6ce86c7f3
commit 15ee118550
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libr/util/num.c
View File

@ -276,7 +276,7 @@ R_API ut64 r_num_math(RNum *num, const char *str) {
}
group[0] = '(';
p = group+1;
if (r_str_delta (p, '(', ')')<0) {
if (r_str_delta (p, '(', ')') < 0) {
char *p2 = strchr (p, '(');
if (p2 != NULL) {
*p2 = '\0';
@ -284,21 +284,26 @@ R_API ut64 r_num_math(RNum *num, const char *str) {
ret = r_num_op (op, ret, r_num_math (num, p2+1));
p = p2+1;
continue;
} else eprintf ("WTF!\n");
} else ret = r_num_op (op, ret, r_num_math_internal (num, p));
} else ret = r_num_op (op, ret, r_num_math_internal (num, p));
}
eprintf ("WTF!\n");
} else {
ret = r_num_op (op, ret, r_num_math_internal (num, p));
}
} else {
ret = r_num_op (op, ret, r_num_math_internal (num, p));
}
} while (0);
if (num != NULL)
if (num) {
num->value = ret;
}
free (os);
return ret;
#endif
}
R_API int r_num_is_float(RNum *num, const char *str) {
// TODO: also support 'f' terminated strings
return (strchr (str, '.') != NULL)? true:false;
return (IS_NUMBER (*str) && (strchr (str, '.') || str[strlen (str) - 1] == 'f'));
}
R_API double r_num_get_float(RNum *num, const char *str) {