Skip to content

Commit

Permalink
qom: Don't keep error value between object_property_parse() calls
Browse files Browse the repository at this point in the history
When handling errp==NULL at object_apply_global_props(), we are
leaving the old error value in `err` after printing a warning.
This makes QEMU crash if two global properties generate warnings:

  $ echo device_add rtl8139 | qemu-system-x86_64 -monitor stdio -global rtl8139.xxx=yyy -global rtl8139.xxx=zzz
  warning: can't apply global rtl8139.xxx=yyy: Property '.xxx' not found
  qemu-system-x86_64: util/error.c:57: error_setv: Assertion `*errp == NULL' failed.
  Aborted (core dumped)

Fix that by making `err` go out of scope immediately after the
warn_report_err() call.

Fixes: 50545b2 "qdev-props: call object_apply_global_props()"
Signed-off-by: Eduardo Habkost <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
Reviewed-by: Marc-André Lureau <[email protected]>
Reviewed-by: Cornelia Huck <[email protected]>
Signed-off-by: Eduardo Habkost <[email protected]>
  • Loading branch information
ehabkost committed Jan 10, 2019
1 parent ab94c6b commit d769f0d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion qom/object.c
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@ static void object_post_init_with_type(Object *obj, TypeImpl *ti)

void object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp)
{
Error *err = NULL;
int i;

if (!props) {
Expand All @@ -381,6 +380,7 @@ void object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp

for (i = 0; i < props->len; i++) {
GlobalProperty *p = g_ptr_array_index(props, i);
Error *err = NULL;

if (object_dynamic_cast(obj, p->driver) == NULL) {
continue;
Expand Down

0 comments on commit d769f0d

Please sign in to comment.