Skip to content

Commit

Permalink
bsd-user: use qemu_strtoul in preference to strtol
Browse files Browse the repository at this point in the history
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
  • Loading branch information
bsdimp committed May 11, 2021
1 parent b23a51d commit 29aabb4
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions bsd-user/main.c
Expand Up @@ -36,6 +36,7 @@
#include "tcg/tcg.h"
#include "qemu/timer.h"
#include "qemu/envlist.h"
#include "qemu/cutils.h"
#include "exec/log.h"
#include "trace/control.h"

Expand Down Expand Up @@ -612,7 +613,7 @@ int main(int argc, char **argv)
TaskState ts1, *ts = &ts1;
CPUArchState *env;
CPUState *cpu;
int optind;
int optind, rv;
const char *r;
const char *gdbstub = NULL;
char **target_environ, **wrk;
Expand Down Expand Up @@ -677,8 +678,8 @@ int main(int argc, char **argv)
}
} else if (!strcmp(r, "s")) {
r = argv[optind++];
x86_stack_size = strtol(r, (char **)&r, 0);
if (x86_stack_size <= 0) {
rv = qemu_strtoul(r, &r, 0, &x86_stack_size);
if (rv < 0 || x86_stack_size <= 0) {
usage();
}
if (*r == 'M') {
Expand Down Expand Up @@ -709,7 +710,10 @@ int main(int argc, char **argv)
exit(1);
}
} else if (!strcmp(r, "B")) {
guest_base = strtol(argv[optind++], NULL, 0);
rv = qemu_strtoul(argv[optind++], NULL, 0, &guest_base);
if (rv < 0) {
usage();
}
have_guest_base = true;
} else if (!strcmp(r, "drop-ld-preload")) {
(void) envlist_unsetenv(envlist, "LD_PRELOAD");
Expand Down

0 comments on commit 29aabb4

Please sign in to comment.