mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
qapi: Assert non-input visitors see only valid narrow integers
visit_type_intN() and visit_type_uintN() fail when the value is out of bounds. This is appropriate with an input visitor: the value comes from input, and input may be bad. It should never happen with the other visitors: the value comes from the caller, and callers must keep it within bounds. Assert that. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20200424084338.26803-10-armbru@redhat.com>
This commit is contained in:
parent
777d20cfa5
commit
faad584adb
|
@ -160,10 +160,13 @@ static void visit_type_uintN(Visitor *v, uint64_t *obj, const char *name,
|
||||||
Error *err = NULL;
|
Error *err = NULL;
|
||||||
uint64_t value = *obj;
|
uint64_t value = *obj;
|
||||||
|
|
||||||
|
assert(v->type == VISITOR_INPUT || value <= max);
|
||||||
|
|
||||||
v->type_uint64(v, name, &value, &err);
|
v->type_uint64(v, name, &value, &err);
|
||||||
if (err) {
|
if (err) {
|
||||||
error_propagate(errp, err);
|
error_propagate(errp, err);
|
||||||
} else if (value > max) {
|
} else if (value > max) {
|
||||||
|
assert(v->type == VISITOR_INPUT);
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
||||||
name ? name : "null", type);
|
name ? name : "null", type);
|
||||||
} else {
|
} else {
|
||||||
|
@ -219,10 +222,13 @@ static void visit_type_intN(Visitor *v, int64_t *obj, const char *name,
|
||||||
Error *err = NULL;
|
Error *err = NULL;
|
||||||
int64_t value = *obj;
|
int64_t value = *obj;
|
||||||
|
|
||||||
|
assert(v->type == VISITOR_INPUT || (value >= min && value <= max));
|
||||||
|
|
||||||
v->type_int64(v, name, &value, &err);
|
v->type_int64(v, name, &value, &err);
|
||||||
if (err) {
|
if (err) {
|
||||||
error_propagate(errp, err);
|
error_propagate(errp, err);
|
||||||
} else if (value < min || value > max) {
|
} else if (value < min || value > max) {
|
||||||
|
assert(v->type == VISITOR_INPUT);
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
|
||||||
name ? name : "null", type);
|
name ? name : "null", type);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue