[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] Revert "qapi: Clean up superfluous null check i
From: |
Luiz Capitulino |
Subject: |
Re: [Qemu-devel] [PATCH] Revert "qapi: Clean up superfluous null check in qapi_dealloc_type_str()" |
Date: |
Thu, 8 May 2014 14:21:13 -0400 |
On Thu, 8 May 2014 18:03:15 +0200
Peter Lieven <address@hidden> wrote:
> 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: address@hidden
> Signed-off-by: Peter Lieven <address@hidden>
> Reviewed-by: Eric Blake <address@hidden>
> Reviewed-by: Markus Armbruster <address@hidden>
Applied to the qmp branch, thanks.
> ---
> qapi/qapi-dealloc-visitor.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> 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,