xf86-video-ati: Branch 'master'

[GitLab Mirror]

 src/radeon.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4d84cf438e7f1bebf0053035ef0292e9fed257d1
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Fri Nov 29 16:37:32 2019 +0100

    Handle NULL fb_ptr in pixmap_get_fb
    
    This can happen when HW acceleration is disabled.
    
    Fixes https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/issues/188

diff --git a/src/radeon.h b/src/radeon.h
index 2c913466..8e964805 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -896,7 +896,7 @@ radeon_pixmap_get_fb(PixmapPtr pix)
 				   handle);
     }
 
-    return *fb_ptr;
+    return fb_ptr ? *fb_ptr : NULL;
 }