yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-04-17 23:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

util/cutils: Let qemu_strtosz*() optionally reject trailing crap

Browse source 
Change the qemu_strtosz() & friends to return -EINVAL when @endptr is
null and the conversion doesn't consume the string completely.
Matches how qemu_strtol() & friends work.

Only test_qemu_strtosz_simple() passes a null @endptr. No functional
change there, because its conversion consumes the string.

Simplify callers that use @endptr only to fail when it doesn't point
to '\0' to pass a null @endptr instead.

Backports commit 4fcdf65ae2c00ae69f7625f26ed41f37d77b403c from qemu
This commit is contained in:
Markus Armbruster 2018-03-02 08:54:50 -05:00 committed by Lioncash
parent f9c9eb7334
commit 6093e67947
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qemu/target/i386/cpu.c
View file

@ -2182,10 +2182,9 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features,
/* Special case: */
if (!strcmp(name, "tsc-freq")) {
int64_t tsc_freq;
char *err;
tsc_freq = qemu_strtosz_metric(val, &err);
if (tsc_freq < 0 || *err) {
tsc_freq = qemu_strtosz_metric(val, NULL);
if (tsc_freq < 0) {
error_setg(errp, "bad numerical value %s", val);
return;
}

14
qemu/util/cutils.c
View file

@ -157,7 +157,7 @@ static int64_t suffix_mul(char suffix, int64_t unit)
static int64_t do_strtosz(const char *nptr, char **end,
const char default_suffix, int64_t unit)
{
int64_t retval = -EINVAL;
int64_t retval;
char *endptr;
unsigned char c;
int mul_required = 0;
@ -166,7 +166,8 @@ static int64_t do_strtosz(const char *nptr, char **end,
errno = 0;
val = strtod(nptr, &endptr);
if (isnan(val) || endptr == nptr || errno != 0) {
goto fail;
retval = -EINVAL;
goto out;
}
fraction = modf(val, &integral);
if (fraction != 0) {
@ -181,17 +182,20 @@ static int64_t do_strtosz(const char *nptr, char **end,
assert(mul >= 0);
}
if (mul == 1 && mul_required) {
goto fail;
retval = -EINVAL;
goto out;
}
if ((val * mul >= INT64_MAX) || val < 0) {
retval = -ERANGE;
goto fail;
goto out;
}
retval = (int64_t)(val * mul);
fail:
out:
if (end) {
*end = endptr;
} else if (*endptr) {
retval = -EINVAL;
}
return retval;