| Message ID | 1460131992-32278-17-git-send-email-eblake@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Eric Blake <eblake@redhat.com> writes: > The qmp-input visitor was playing rather fast and loose: when > visiting a QDict, you could grab members of the root dictionary > without first pushing into the dict. But we are about to tighten > the input visitor, at which point user_creatable_add_type() MUST > follow the same paradigms as everyone else, of pushing into the > struct before grabbing its keys, because the value of 'name' > should be ignored on the top-level visit. Aha, this is another second client playing fast and loose. > > The change has no impact to the testsuite now, but is required to > avoid a failure in tests/test-netfilter once qmp-input is made > stricter. > > Signed-off-by: Eric Blake <eblake@redhat.com> > > --- > v14: no change > v13: no change > v12: new patch > --- > qom/object_interfaces.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c > index a0bf6b7..62ec75a 100644 > --- a/qom/object_interfaces.c > +++ b/qom/object_interfaces.c > @@ -118,12 +118,23 @@ Object *user_creatable_add_type(const char *type, const char *id, > > obj = object_new(type); > if (qdict) { > + visit_start_struct(v, NULL, NULL, 0, &local_err); > + if (local_err) { > + goto out; > + } > for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) { > object_property_set(obj, v, e->key, &local_err); > if (local_err) { > - goto out; > + break; > } > } > + if (!local_err) { > + visit_check_struct(v, &local_err); Does this find errors that weren't found before? > + } > + visit_end_struct(v); > + if (local_err) { > + goto out; > + } > } > > object_property_add_child(object_get_objects_root(),
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index a0bf6b7..62ec75a 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -118,12 +118,23 @@ Object *user_creatable_add_type(const char *type, const char *id, obj = object_new(type); if (qdict) { + visit_start_struct(v, NULL, NULL, 0, &local_err); + if (local_err) { + goto out; + } for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) { object_property_set(obj, v, e->key, &local_err); if (local_err) { - goto out; + break; } } + if (!local_err) { + visit_check_struct(v, &local_err); + } + visit_end_struct(v); + if (local_err) { + goto out; + } } object_property_add_child(object_get_objects_root(),
The qmp-input visitor was playing rather fast and loose: when visiting a QDict, you could grab members of the root dictionary without first pushing into the dict. But we are about to tighten the input visitor, at which point user_creatable_add_type() MUST follow the same paradigms as everyone else, of pushing into the struct before grabbing its keys, because the value of 'name' should be ignored on the top-level visit. The change has no impact to the testsuite now, but is required to avoid a failure in tests/test-netfilter once qmp-input is made stricter. Signed-off-by: Eric Blake <eblake@redhat.com> --- v14: no change v13: no change v12: new patch --- qom/object_interfaces.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)