Mesa (master): st/omx/dec: fix possible segfault at eos

[Christian König]

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

Author: Christian König <christian.koenig at amd.com>
Date:   Fri Mar 14 13:59:19 2014 +0100

st/omx/dec: fix possible segfault at eos

Signed-off-by: Christian König <christian.koenig at amd.com>

---

 src/gallium/state_trackers/omx/vid_dec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/omx/vid_dec.c b/src/gallium/state_trackers/omx/vid_dec.c
index e2a2891..de1c3825 100644
--- a/src/gallium/state_trackers/omx/vid_dec.c
+++ b/src/gallium/state_trackers/omx/vid_dec.c
@@ -504,7 +504,7 @@ static OMX_ERRORTYPE vid_dec_DecodeBuffer(omx_base_PortType *port, OMX_BUFFERHEA
       }
 
       if (--priv->num_in_buffers) {
-         unsigned delta = (min_bits_left - vl_vlc_bits_left(&vlc)) / 8;
+         unsigned delta = MIN2((min_bits_left - vl_vlc_bits_left(&vlc)) / 8, priv->sizes[1]);
 
          priv->in_buffers[0] = priv->in_buffers[1];
          priv->sizes[0] = priv->sizes[1] - delta;