[PATCH 2/5] __glXDRIscreenProbe: free screen when DRI2Connect fails, instead of leaking it

Alan Coopersmith alan.coopersmith at oracle.com
Mon Apr 1 22:09:20 PDT 2013


Reported with other leaks found by cppcheck in bugzilla #50281
https://bugs.freedesktop.org/show_bug.cgi?id=50281

V2: goto existing error handler, instead of replicating more of it here

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 glx/glxdri2.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index e07cb56..6548579 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -946,7 +946,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
                      &screen->fd, &driverName, &deviceName)) {
         LogMessage(X_INFO,
                    "AIGLX: Screen %d is not DRI2 capable\n", pScreen->myNum);
-        return NULL;
+        goto handle_error;
     }
 
     screen->base.destroy = __glXDRIscreenDestroy;
-- 
1.7.9.2



More information about the xorg-devel mailing list