[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/10] qom: Don't keep error value between object_pro
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 10/10] qom: Don't keep error value between object_property_parse() calls |
Date: |
Thu, 10 Jan 2019 12:29:55 -0200 |
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
qom/object.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL 00/10] Machine queue, 2019-01-10, Eduardo Habkost, 2019/01/10
- [Qemu-devel] [PULL 01/10] qemu-deprecated.texi: Rename the HMP section, Eduardo Habkost, 2019/01/10
- [Qemu-devel] [PULL 02/10] Update that HMP 'cpu-add' is deprecated in 4.0, Eduardo Habkost, 2019/01/10
- [Qemu-devel] [PULL 03/10] Mention that QMP 'cpu-add' will be deprecated, Eduardo Habkost, 2019/01/10
- [Qemu-devel] [PULL 04/10] range: add some more functions, Eduardo Habkost, 2019/01/10
- [Qemu-devel] [PULL 05/10] memory-device: rewrite address assignment using ranges, Eduardo Habkost, 2019/01/10
- [Qemu-devel] [PULL 06/10] spapr: Eliminate SPAPR_PCI_2_7_MMIO_WIN_SIZE macro, Eduardo Habkost, 2019/01/10
- [Qemu-devel] [PULL 07/10] machine: Eliminate unnecessary stringify() usage, Eduardo Habkost, 2019/01/10
- [Qemu-devel] [PULL 10/10] qom: Don't keep error value between object_property_parse() calls,
Eduardo Habkost <=
- [Qemu-devel] [PULL 08/10] machine: Use shorter format for GlobalProperty arrays, Eduardo Habkost, 2019/01/10
- [Qemu-devel] [PULL 09/10] qdev: fix -device scsi-hd, help regression, Eduardo Habkost, 2019/01/10
- Re: [Qemu-devel] [PULL 00/10] Machine queue, 2019-01-10, Peter Maydell, 2019/01/11
- Re: [Qemu-devel] [PULL 00/10] Machine queue, 2019-01-10, no-reply, 2019/01/11