From patchwork Mon Jul 16 14:02:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Wiederhake X-Patchwork-Id: 1201091 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 91564E0038 for ; Mon, 16 Jul 2012 14:32:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F67C9F74B for ; Mon, 16 Jul 2012 07:32:31 -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 B5ED69F74D for ; Mon, 16 Jul 2012 07:29:33 -0700 (PDT) Received: (qmail invoked by alias); 16 Jul 2012 14:02:58 -0000 Received: from host-188-174-209-55.customer.m-online.net (EHLO localhost.localdomain) [188.174.209.55] by mail.gmx.net (mp031) with SMTP; 16 Jul 2012 16:02:58 +0200 X-Authenticated: #57610014 X-Provags-ID: V01U2FsdGVkX1+JhEZSmVeJbC20z3xsnMZtpujWEVl2DjMcuOSr0u M1d5kmQDNMxych From: Tim Wiederhake To: dri-devel@lists.freedesktop.org Subject: [PATCH 4/8] Fix memory leaks Date: Mon, 16 Jul 2012 16:02:48 +0200 Message-Id: <1342447372-21742-4-git-send-email-twied@gmx.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342447372-21742-1-git-send-email-twied@gmx.net> References: <1342447372-21742-1-git-send-email-twied@gmx.net> X-Y-GMX-Trusted: 0 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 --- libkms/intel.c | 3 ++- libkms/nouveau.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libkms/intel.c b/libkms/intel.c index 8b8249b..238bec7 100644 --- a/libkms/intel.c +++ b/libkms/intel.c @@ -101,7 +101,8 @@ intel_bo_create(struct kms_driver *kms, pitch = (pitch + 512 - 1) & ~(512 - 1); size = pitch * ((height + 4 - 1) & ~(4 - 1)); } else { - return -EINVAL; + ret = -EINVAL; + goto err_free; } memset(&arg, 0, sizeof(arg)); diff --git a/libkms/nouveau.c b/libkms/nouveau.c index 0e24a15..f12c672 100644 --- a/libkms/nouveau.c +++ b/libkms/nouveau.c @@ -102,7 +102,8 @@ nouveau_bo_create(struct kms_driver *kms, pitch = (pitch + 512 - 1) & ~(512 - 1); size = pitch * height; } else { - return -EINVAL; + ret = -EINVAL; + goto err_free; } memset(&arg, 0, sizeof(arg));