From: Vinson Lee <vlee@vmware.com>
Date: Sun, 22 Nov 2009 06:10:38 +0000 (-0500)
Subject: st/xorg: Prevent potential null pointer deference in xorg_xv.c.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=88aab56a26dd33a2d3177a41420f00473d7270af;p=mesa.git

st/xorg: Prevent potential null pointer deference in xorg_xv.c.
---

diff --git a/src/gallium/state_trackers/xorg/xorg_xv.c b/src/gallium/state_trackers/xorg/xorg_xv.c
index a1e74fad598..e7f4900528d 100644
--- a/src/gallium/state_trackers/xorg/xorg_xv.c
+++ b/src/gallium/state_trackers/xorg/xorg_xv.c
@@ -446,7 +446,7 @@ display_video(ScrnInfoPtr pScrn, struct xorg_xv_port_priv *pPriv, int id,
    int x, y, w, h;
    struct exa_pixmap_priv *dst = exaGetPixmapDriverPrivate(pPixmap);
 
-   if (!dst->tex) {
+   if (dst && !dst->tex) {
 	xorg_exa_set_shared_usage(pPixmap);
 	pScrn->pScreen->ModifyPixmapHeader(pPixmap, 0, 0, 0, 0, 0, NULL);
    }