From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhGpJ-00038a-E7 for qemu-devel@nongnu.org; Mon, 05 May 2014 07:12:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WhGpE-0005Kf-An for qemu-devel@nongnu.org; Mon, 05 May 2014 07:12:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhGpE-0005K7-3N for qemu-devel@nongnu.org; Mon, 05 May 2014 07:12:48 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s45BCljh026603 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 5 May 2014 07:12:47 -0400 From: Gerd Hoffmann Date: Mon, 5 May 2014 13:12:35 +0200 Message-Id: <1399288360-29897-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1399288360-29897-1-git-send-email-kraxel@redhat.com> References: <1399288360-29897-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 06/10] usb: mtp: fix error path memory leak List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Reviewed-by: Peter Wu Reviewed-by: Stefan Hajnoczi --- hw/usb/dev-mtp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 775dc8d..45f9562 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -669,6 +669,7 @@ static MTPData *usb_mtp_get_object(MTPState *s, MTPControl *c, d->fd = open(o->path, O_RDONLY); if (d->fd == -1) { + usb_mtp_data_free(d); return NULL; } d->length = o->stat.st_size; @@ -688,6 +689,7 @@ static MTPData *usb_mtp_get_partial_object(MTPState *s, MTPControl *c, d->fd = open(o->path, O_RDONLY); if (d->fd == -1) { + usb_mtp_data_free(d); return NULL; } -- 1.8.3.1