From patchwork Fri Jul 13 18:34:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Obermayr X-Patchwork-Id: 1196631 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 7E6EA3FC4C for ; Fri, 13 Jul 2012 18:41:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A8949E7B6 for ; Fri, 13 Jul 2012 11:41:08 -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 248909E85A for ; Fri, 13 Jul 2012 11:36:39 -0700 (PDT) Received: (qmail invoked by alias); 13 Jul 2012 18:36:39 -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:39 +0200 X-Authenticated: #1405430 X-Provags-ID: V01U2FsdGVkX18IHbgTQv8IISXiUXbZdwGYCSdXBBJiq9yneZTZhw ybCk4WHQ0GuWCy From: Johannes Obermayr To: dri-devel@lists.freedesktop.org, marcin.slusarz@gmail.com Subject: [PATCH 5/6] xf86drm.c: Fix two memory leaks. Date: Fri, 13 Jul 2012 20:34:25 +0200 Message-Id: <1342204466-15460-6-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 --- xf86drm.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xf86drm.c b/xf86drm.c index e652731..c1cc170 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -1399,8 +1399,11 @@ drm_context_t *drmGetReservedContextList(int fd, int *count) } res.contexts = list; - if (drmIoctl(fd, DRM_IOCTL_RES_CTX, &res)) + if (drmIoctl(fd, DRM_IOCTL_RES_CTX, &res)) { + drmFree(list); + drmFree(retval); return NULL; + } for (i = 0; i < res.count; i++) retval[i] = list[i].handle;