From patchwork Fri Jul 13 18:34:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Obermayr X-Patchwork-Id: 1196611 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id B8FB63FC4C for ; Fri, 13 Jul 2012 18:39:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B4DA1A1182 for ; Fri, 13 Jul 2012 11:39:21 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by gabe.freedesktop.org (Postfix) with SMTP id A79B19E77E for ; Fri, 13 Jul 2012 11:36:39 -0700 (PDT) Received: (qmail invoked by alias); 13 Jul 2012 18:36:38 -0000 Received: from p57915C2C.dip.t-dialin.net (EHLO jobermayr.MSHEIMNETZ) [87.145.92.44] by mail.gmx.net (mp041) with SMTP; 13 Jul 2012 20:36:38 +0200 X-Authenticated: #1405430 X-Provags-ID: V01U2FsdGVkX1+LlF13jUKLoIa+0YDUsxXtYe82ufOamgk2x2IxtX 3kZ6sViffky4Qp From: Johannes Obermayr To: dri-devel@lists.freedesktop.org, marcin.slusarz@gmail.com Subject: [PATCH 3/6] nouveau/nouveau.c: Fix two memory leaks. Date: Fri, 13 Jul 2012 20:34:23 +0200 Message-Id: <1342204466-15460-4-git-send-email-johannesobermayr@gmx.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1342204466-15460-1-git-send-email-johannesobermayr@gmx.de> References: <20120713164750.GA31630@joi.lan> <1342204466-15460-1-git-send-email-johannesobermayr@gmx.de> X-Y-GMX-Trusted: 0 Cc: Johannes Obermayr X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org --- nouveau/nouveau.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c index 5aa4107..e91287f 100644 --- a/nouveau/nouveau.c +++ b/nouveau/nouveau.c @@ -95,6 +95,7 @@ nouveau_device_wrap(int fd, int close, struct nouveau_device **pdev) (dev->drm_version < 0x01000000 || dev->drm_version >= 0x02000000)) { nouveau_device_del(&dev); + free(nvdev); return -EINVAL; } @@ -105,6 +106,7 @@ nouveau_device_wrap(int fd, int close, struct nouveau_device **pdev) ret = nouveau_getparam(dev, NOUVEAU_GETPARAM_AGP_SIZE, &gart); if (ret) { nouveau_device_del(&dev); + free(nvdev); return ret; }