From 4fcdf65ae2c00ae69f7625f26ed41f37d77b403c Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 21 Feb 2017 21:14:05 +0100 Subject: util/cutils: Let qemu_strtosz*() optionally reject trailing crap 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. Cc: Dr. David Alan Gilbert Cc: Eduardo Habkost (maintainer:X86) Cc: Kevin Wolf (supporter:Block layer core) Cc: Max Reitz (supporter:Block layer core) Cc: qemu-block@nongnu.org (open list:Block layer core) Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Dr. David Alan Gilbert Message-Id: <1487708048-2131-22-git-send-email-armbru@redhat.com> --- qemu-io-cmds.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'qemu-io-cmds.c') diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 0166cfa..973eb94 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -137,14 +137,9 @@ static char **breakline(char *input, int *count) static int64_t cvtnum(const char *s) { - char *end; int64_t ret; - ret = qemu_strtosz(s, &end); - if (*end != '\0') { - /* Detritus at the end of the string */ - return -EINVAL; - } + ret = qemu_strtosz(s, NULL); return ret; } -- cgit v1.1