emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be stricter when converting strings to integers. Should fix the problem

Browse Source 
reported by Rob.
This commit is contained in:
Manuel Novoa III 2004-01-25 19:47:10 +00:00
parent bbbe21d6b0
commit 7018385fe7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
coreutils/expr.c
View File

@ -157,15 +157,17 @@ static void tostring (VALUE *v)
static int toarith (VALUE *v)
{
if(v->type == string) {
int i;
int i;
char *e;
/* Don't interpret the empty string as an integer. */
if (v->u.s == 0)
return 0;
i = atoi(v->u.s);
free (v->u.s);
v->u.i = i;
v->type = integer;
/* Don't interpret the empty string as an integer. */
/* Currently does not worry about overflow or int/long differences. */
i = (int) strtol(v->u.s, &e, 10);
if ((v->u.s == e) || *e)
return 0;
free (v->u.s);
v->u.i = i;
v->type = integer;
}
return 1;
}