Mesa (master): st/xorg: fix crash triggered by rendercheck -t blend -f a8r8g8b8 -o Clear

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 54d1b718b897742bf424f61f911e4ca8bbffa689
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=54d1b718b897742bf424f61f911e4ca8bbffa689

Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date:   Mon May 16 21:52:05 2011 +0200

st/xorg: fix crash triggered by rendercheck -t blend -f a8r8g8b8 -o Clear

---

 src/gallium/state_trackers/xorg/xorg_composite.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/xorg_composite.c b/src/gallium/state_trackers/xorg/xorg_composite.c
index d4dc84a..b5dacd2 100644
--- a/src/gallium/state_trackers/xorg/xorg_composite.c
+++ b/src/gallium/state_trackers/xorg/xorg_composite.c
@@ -237,7 +237,7 @@ picture_format_fixups(struct exa_pixmap_priv *pSrc, PicturePtr pSrcPicture, bool
    boolean swizzle = FALSE;
    unsigned ret = 0;
 
-   if (pSrc->picture_format == pSrcPicture->format) {
+   if (pSrc && pSrc->picture_format == pSrcPicture->format) {
       if (pSrc->picture_format == PICT_a8) {
          if (mask)
             return FS_MASK_LUMINANCE;
@@ -252,7 +252,7 @@ picture_format_fixups(struct exa_pixmap_priv *pSrc, PicturePtr pSrcPicture, bool
       return 0;
    }
 
-   if (pSrc->picture_format != PICT_a8r8g8b8) {
+   if (pSrc && pSrc->picture_format != PICT_a8r8g8b8) {
       assert(!"can not handle formats");
       return 0;
    }