diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-02-21 21:14:05 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-02-23 20:35:36 +0100 |
| commit | 4fcdf65ae2c00ae69f7625f26ed41f37d77b403c (patch) | |
| tree | 78ee373aeb4aa5f17f9bd21ae042e985deb836cc /qapi/opts-visitor.c | |
| parent | 606caa0a2abdb8ff9174bb5bd5861ed2b63d1de2 (diff) | |
| download | qemu-4fcdf65ae2c00ae69f7625f26ed41f37d77b403c.tar.gz | |
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 <dgilbert@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com> (maintainer:X86)
Cc: Kevin Wolf <kwolf@redhat.com> (supporter:Block layer core)
Cc: Max Reitz <mreitz@redhat.com> (supporter:Block layer core)
Cc: qemu-block@nongnu.org (open list:Block layer core)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <1487708048-2131-22-git-send-email-armbru@redhat.com>
Diffstat (limited to 'qapi/opts-visitor.c')
| -rw-r--r-- | qapi/opts-visitor.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index 360d33773f..911a0ee300 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -482,15 +482,14 @@ opts_type_size(Visitor *v, const char *name, uint64_t *obj, Error **errp) OptsVisitor *ov = to_ov(v); const QemuOpt *opt; int64_t val; - char *endptr; opt = lookup_scalar(ov, name, errp); if (!opt) { return; } - val = qemu_strtosz(opt->str ? opt->str : "", &endptr); - if (val < 0 || *endptr) { + val = qemu_strtosz(opt->str ? opt->str : "", NULL); + if (val < 0) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name, "a size value representible as a non-negative int64"); return; |