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

[Marek Olšák]

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

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

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

---

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

diff --git a/src/gallium/state_trackers/xorg/xorg_composite.c b/src/gallium/state_trackers/xorg/xorg_composite.c
index b5dacd2..f696b72 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;