From: Jakob Bornecrantz <jakob@vmware.com>
Date: Tue, 10 Nov 2009 07:55:26 +0000 (+0100)
Subject: st/xorg: Don't segfault when debug printing
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3201c655e4c393d5ae794e6373de8ef705b979a4;p=mesa.git

st/xorg: Don't segfault when debug printing
---

diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c b/src/gallium/state_trackers/xorg/xorg_exa.c
index 19c0151e692..35fba249969 100644
--- a/src/gallium/state_trackers/xorg/xorg_exa.c
+++ b/src/gallium/state_trackers/xorg/xorg_exa.c
@@ -476,9 +476,9 @@ ExaPrepareComposite(int op, PicturePtr pSrcPicture,
    debug_printf("ExaPrepareComposite(%d, src=0x%p, mask=0x%p, dst=0x%p)\n",
                 op, pSrcPicture, pMaskPicture, pDstPicture);
    debug_printf("\tFormats: src(%s), mask(%s), dst(%s)\n",
-                render_format_name(pSrcPicture->format),
-                render_format_name(pMaskPicture->format),
-                render_format_name(pDstPicture->format));
+                pSrcPicture ? render_format_name(pSrcPicture->format) : "none",
+                pMaskPicture ? render_format_name(pMaskPicture->format) : "none",
+                pDstPicture ? render_format_name(pDstPicture->format) : "none");
 #endif
    if (!exa->pipe)
       XORG_FALLBACK("accle not enabled");