fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Harden parseoffset() even more

Browse Source 
1) Check for NULL.
2) Check for empty strings.
3) Clarify error-messages.
This commit is contained in:
FRIGN 2015-09-30 19:14:14 +02:00 committed by sin
parent 8163451249
commit 870a75076d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libutil/parseoffset.c
View File

@ -14,6 +14,11 @@ parseoffset(const char *str)
int base = 10; int base = 10;
char *end; char *end;
if (!str || !*str) {
weprintf("parseoffset: empty string\n");
return -1;
}
/* bases */ /* bases */
if (!strncasecmp(str, "0x", strlen("0x"))) { if (!strncasecmp(str, "0x", strlen("0x"))) {
base = 16; base = 16;
@ -24,7 +29,7 @@ parseoffset(const char *str)
res = strtol(str, &end, base); res = strtol(str, &end, base);
if (res < 0) { if (res < 0) {
weprintf("invalid file offset: %s\n", str); weprintf("parseoffset %s: negative value\n", str);
return -1; return -1;
} }
@ -44,14 +49,14 @@ parseoffset(const char *str)
scale = 1024L * 1024L * 1024L; scale = 1024L * 1024L * 1024L;
break; break;
default: default:
weprintf("invalid file offset suffix: %s\n", str); weprintf("parseoffset %s: invalid suffix\n", str);
return -1; return -1;
} }
} }
/* prevent overflow */ /* prevent overflow */
if (res > (SIZE_MAX / scale)) { if (res > (SIZE_MAX / scale)) {
weprintf("file offset out of range: %s\n", str); weprintf("parseoffset %s: out of range\n", str);
return -1; return -1;
} }