From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:47041)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1SVUbR-0001st-1D
	for qemu-devel@nongnu.org; Fri, 18 May 2012 17:20:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1SVUbO-0003Hx-Np
	for qemu-devel@nongnu.org; Fri, 18 May 2012 17:20:48 -0400
Received: from v220110690675601.yourvserver.net ([78.47.199.172]:50304)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1SVUbO-0003Hg-DX
	for qemu-devel@nongnu.org; Fri, 18 May 2012 17:20:46 -0400
Message-ID: <4FB6BD2A.7060403@weilnetz.de>
Date: Fri, 18 May 2012 23:20:42 +0200
From: Stefan Weil <sw@weilnetz.de>
MIME-Version: 1.0
References: <k4094u7u.fsf@gmail.com>
In-Reply-To: <k4094u7u.fsf@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 1.1 v2] qdev: Fix memory leak
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: dunrong huang <riegamaths@gmail.com>
Cc: Stefan Hajnoczi <stefanha@gmail.com>, Anthony Liguori <aliguori@us.ibm.com>, qemu-devel@nongnu.org, Michael Roth <mdroth@linux.vnet.ibm.com>

Am 18.05.2012 13:14, schrieb dunrong huang:
> The str allocated in visit_type_str was not freed.
>
> The visit_type_str function is an input visitor(<QMP/String/etc>-to-native)
> here, it will allocate memory for caller, so the caller is responsible for
> freeing the memory.
>
> Signed-off-by: dunrong huang<riegamaths@gmail.com>
> ---
>   hw/qdev-properties.c |    6 +++++-
>   1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
> index c5545dc..b7b5597 100644
> --- a/hw/qdev-properties.c
> +++ b/hw/qdev-properties.c
> @@ -753,10 +753,12 @@ static void set_mac(Object *obj, Visitor *v, void *opaque,
>           }
>           mac->a[i] = strtol(str+pos,&p, 16);
>       }
> +    g_free(str);
>       return;
>
>   inval:
>       error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str);
> +    g_free(str);
>   }
>
>   PropertyInfo qdev_prop_macaddr = {
> @@ -825,7 +827,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque,
>       uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
>       unsigned int slot, fn, n;
>       Error *local_err = NULL;
> -    char *str = (char *)"";
> +    char *str;
>
>       if (dev->state != DEV_STATE_CREATED) {
>           error_set(errp, QERR_PERMISSION_DENIED);
> @@ -848,10 +850,12 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque,
>           goto invalid;
>       }
>       *ptr = slot<<  3 | fn;
> +    g_free(str);
>       return;
>
>   invalid:
>       error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str);
> +    g_free(str);
>   }
>
>   static int print_pci_devfn(DeviceState *dev, Property *prop, char *dest, size_t len)


Reviewed-by: Stefan Weil <sw@weilnetz.de>