From 0355e280a39dee68981b2cbebfa2573cfde2f5bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
Date: Thu, 11 Dec 2014 16:50:38 +0900
Subject: [PATCH] glamor: Make glamor_set_pixmap_private not crash if the
 pixmap has no fbo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 glamor/glamor.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/glamor/glamor.c b/glamor/glamor.c
index c4f3f3a34..cbd0e02ad 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -563,8 +563,11 @@ glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private *priv)
     else {
         if (old_priv == NULL)
             return;
-        fbo = glamor_pixmap_detach_fbo(old_priv);
-        glamor_purge_fbo(fbo);
+
+        if (old_priv->base.fbo) {
+            fbo = glamor_pixmap_detach_fbo(old_priv);
+            glamor_purge_fbo(fbo);
+        }
         free(old_priv);
     }