[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/5] chardev/char.c: Always pass id to chardev_new
From: |
Lukas Straub |
Subject: |
[PATCH 4/5] chardev/char.c: Always pass id to chardev_new |
Date: |
Mon, 22 Mar 2021 00:31:57 +0100 |
Always pass the id to chardev_new, since it is needed to register
the yank instance for the chardev. Also, after checking that
nothing calls chardev_new with id=NULL, assert() that id!=NULL.
This fixes a crash when using chardev-change to change a chardev
to chardev-socket, which attempts to register a yank instance.
This in turn tries to dereference the NULL-pointer.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
chardev/char.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chardev/char.c b/chardev/char.c
index 1584865027..ad416c0714 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -964,6 +964,7 @@ static Chardev *chardev_new(const char *id, const char
*typename,
bool be_opened = true;
assert(g_str_has_prefix(typename, "chardev-"));
+ assert(id);
obj = object_new(typename);
chr = CHARDEV(obj);
@@ -1092,12 +1093,11 @@ ChardevReturn *qmp_chardev_change(const char *id,
ChardevBackend *backend,
return NULL;
}
- chr_new = chardev_new(NULL, object_class_get_name(OBJECT_CLASS(cc)),
+ chr_new = chardev_new(id, object_class_get_name(OBJECT_CLASS(cc)),
backend, chr->gcontext, errp);
if (!chr_new) {
return NULL;
}
- chr_new->label = g_strdup(id);
if (chr->be_open && !chr_new->be_open) {
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
--
2.30.2
pgpMjUdrQTpqz.pgp
Description: OpenPGP digital signature
[PATCH 2/5] tests: Add tests for yank with the chardev-change, Lukas Straub, 2021/03/21
[PATCH 3/5] chardev/char.c: Move object_property_try_add_child out of chardev_new, Lukas Straub, 2021/03/21
[PATCH 4/5] chardev/char.c: Always pass id to chardev_new,
Lukas Straub <=
[PATCH 5/5] chardev: Fix yank with the chardev-change case, Lukas Straub, 2021/03/21