diff options
| author | Peter Lieven <pl@kamp.de> | 2014-05-08 18:03:15 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2014-07-20 22:23:46 -0500 |
| commit | c230ab2ba22a6c91d690dc57bd1157c8fc243f12 (patch) | |
| tree | 67a2e56a0901a3c1ec54f3358254648619ac0716 | |
| parent | 274c96e4e12a1829def558534c4eb1a77c4865eb (diff) | |
| download | qemu-c230ab2ba22a6c91d690dc57bd1157c8fc243f12.zip qemu-c230ab2ba22a6c91d690dc57bd1157c8fc243f12.tar.gz qemu-c230ab2ba22a6c91d690dc57bd1157c8fc243f12.tar.bz2 | |
Revert "qapi: Clean up superfluous null check in qapi_dealloc_type_str()"
This reverts commit 25a7017555f1b4aeb543b5d323ff4afb8f9c5437.
Turns out the argument *can* be null: QEMU now segfaults if it
receives an invalid parameter via a qmp command instead of throwing an
error.
For example:
{ "execute": "blockdev-add",
"arguments": { "options" : { "driver": "invalid-driver" } } }
CC: qemu-stable@nongnu.org
Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
(cherry picked from commit b690d679c1ca65d71b0544a2331d50e9f0f95116)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | qapi/qapi-dealloc-visitor.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index d0ea118..dc53545 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -131,7 +131,9 @@ static void qapi_dealloc_end_list(Visitor *v, Error **errp) static void qapi_dealloc_type_str(Visitor *v, char **obj, const char *name, Error **errp) { - g_free(*obj); + if (obj) { + g_free(*obj); + } } static void qapi_dealloc_type_int(Visitor *v, int64_t *obj, const char *name, |