diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2019-01-10 00:02:57 -0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2019-01-10 12:25:15 -0200 |
| commit | d769f0dfeeaa1554a38fedb16bb20a4b0ecf793c (patch) | |
| tree | 52c4b5ee118c810398f442f503d1d4981e59c17b /qom/object.c | |
| parent | ab94c6b42f4ae247843f93956ccc0468b6c75bf3 (diff) | |
| download | focaccia-qemu-d769f0dfeeaa1554a38fedb16bb20a4b0ecf793c.tar.gz focaccia-qemu-d769f0dfeeaa1554a38fedb16bb20a4b0ecf793c.zip | |
qom: Don't keep error value between object_property_parse() calls
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: 50545b2cc029 "qdev-props: call object_apply_global_props()" Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20190110020259.8492-2-ehabkost@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'qom/object.c')
| -rw-r--r-- | qom/object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qom/object.c b/qom/object.c index aa6f3a2a71..4e5226ca12 100644 --- a/qom/object.c +++ b/qom/object.c @@ -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) { @@ -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; |