From patchwork Thu May 3 08:34:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dunrong huang X-Patchwork-Id: 156771 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 13725B6FC2 for ; Fri, 4 May 2012 06:23:31 +1000 (EST) Received: from localhost ([::1]:32860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SQ2Yi-0005G1-Ry for incoming@patchwork.ozlabs.org; Thu, 03 May 2012 16:23:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPrV7-0002Kt-RK for qemu-devel@nongnu.org; Thu, 03 May 2012 04:35:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPrV0-0006vS-1c for qemu-devel@nongnu.org; Thu, 03 May 2012 04:35:01 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:51074) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPrUz-0006v1-Ph; Thu, 03 May 2012 04:34:53 -0400 Received: by dady13 with SMTP id y13so1328887dad.5 for ; Thu, 03 May 2012 01:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=asnpkqicstGZo2q6fAWZXgdmQQGGgvtmw8vxWiDrKxs=; b=QaPwrYCOKtKeyBCCt6Cud1XezS6cf1/D8FZCOAh2ApV5f8pS0rjkhVXCn6nKrJEq5J DZcVeIm1OkRzkfqqr0zLXxXvTyynisc+VhO4c+v1cQyUxFZgfcl+xN4ItE9bDWeDnWXV 48azhzVxcApAXuFQtItGDBlM8G2IfSDksNgMmzs3gQAl61TZNK7gdG8I6gtuIXBVcRDs aNKYA2l5WOz7MeRgpHJpBllIbcSg58u4Z6HU0+fdAcejeOCsfnVBoGM3teiQb/52cJ+I o6TFl6Qhk+eJeoRDFOyNmdrE5BpQJiHjhP2mqGNJDPIsyuEe4V3JVkK9nbccXFeSM4M8 intg== Received: by 10.68.221.136 with SMTP id qe8mr5311402pbc.108.1336034091085; Thu, 03 May 2012 01:34:51 -0700 (PDT) Received: from riegamaths@gmail.com ([119.255.44.227]) by mx.google.com with ESMTPS id pz3sm4627964pbc.16.2012.05.03.01.34.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 May 2012 01:34:50 -0700 (PDT) Received: by riegamaths@gmail.com (sSMTP sendmail emulation); Thu, 03 May 2012 16:35:23 +0800 From: dunrong huang To: qemu-devel@nongnu.org Date: Thu, 3 May 2012 16:34:42 +0800 Message-Id: <1336034082-5288-1-git-send-email-riegamaths@gmail.com> X-Mailer: git-send-email 1.7.8.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.46 X-Mailman-Approved-At: Thu, 03 May 2012 16:23:18 -0400 Cc: qemu-trivial@nongnu.org, Anthony Liguori , dunrong huang Subject: [Qemu-devel] [PATCH] qdev: Fix memory leak X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The str allocated in visit_type_str was not freed Signed-off-by: dunrong huang Tested-by: Stefan Weil --- hw/qdev-properties.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 98dd06a..8088699 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -726,7 +726,7 @@ static void set_mac(Object *obj, Visitor *v, void *opaque, MACAddr *mac = qdev_get_prop_ptr(dev, prop); Error *local_err = NULL; int i, pos; - char *str, *p; + char *str = NULL, *p; if (dev->state != DEV_STATE_CREATED) { error_set(errp, QERR_PERMISSION_DENIED); @@ -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 = NULL; if (dev->state != DEV_STATE_CREATED) { error_set(errp, QERR_PERMISSION_DENIED); @@ -847,10 +849,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)