From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Mon, 16 May 2011 19:52:47 +0000 (+0200)
Subject: st/xorg: fix crash triggered by rendercheck -t composite -f a8r8g8b8 -o Src, Saturate
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fe20edf959c4ec565ef29f2556e03ce36e0c259f;p=mesa.git

st/xorg: fix crash triggered by rendercheck -t composite -f a8r8g8b8 -o Src, Saturate

samplers[0] may remain uninititialized if src picture/pixmap is null
---

diff --git a/src/gallium/state_trackers/xorg/xorg_composite.c b/src/gallium/state_trackers/xorg/xorg_composite.c
index b5dacd20bb5..f696b72e1e3 100644
--- a/src/gallium/state_trackers/xorg/xorg_composite.c
+++ b/src/gallium/state_trackers/xorg/xorg_composite.c
@@ -355,7 +355,7 @@ bind_samplers(struct exa_context *exa, int op,
               struct exa_pixmap_priv *pMask,
               struct exa_pixmap_priv *pDst)
 {
-   struct pipe_sampler_state *samplers[PIPE_MAX_SAMPLERS];
+   struct pipe_sampler_state *samplers[PIPE_MAX_SAMPLERS] = {0};
    struct pipe_sampler_state src_sampler, mask_sampler;
    struct pipe_sampler_view view_templ;
    struct pipe_sampler_view *src_view;