diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2011-05-16 21:52:05 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-06-20 02:11:12 +0200 |
| commit | 54d1b718b897742bf424f61f911e4ca8bbffa689 (patch) | |
| tree | 288bac3483a604dd6bdff2a399a3cf003efb1512 | |
| parent | badf0335ef70223204fbae3e8fdef718cdb3ad19 (diff) | |
st/xorg: fix crash triggered by rendercheck -t blend -f a8r8g8b8 -o Clear
| -rw-r--r-- | 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 d4dc84a122..b5dacd20bb 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; } |