[PATCH] glamor: Don't try to free the pixmap priv if we fail to allocate FBO.

Eric Anholt eric at anholt.net
Mon Jul 27 18:51:33 PDT 2015


Fixes a regression since a2a2f6e34bd49e7ae31779274d52e800595660bc.  I
missed this in testing on x86, because we never fail to allocate an
FBO.  We do hit this path on VC4, though.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 glamor/glamor.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/glamor/glamor.c b/glamor/glamor.c
index 6dcc259..2db8f20 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -194,7 +194,6 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
 
     if (fbo == NULL) {
         fbDestroyPixmap(pixmap);
-        free(pixmap_priv);
         return fbCreatePixmap(screen, w, h, depth, usage);
     }
 
-- 
2.1.4



More information about the xorg-devel mailing list