Browse code

JPEG-LS: clip offset based on cur_scan to valid range.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Reimar Döffinger authored on 2011/08/28 04:28:38
Showing 1 changed files
... ...
@@ -286,8 +286,8 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transfor
286 286
 //    av_log(s->avctx, AV_LOG_DEBUG, "JPEG-LS params: %ix%i NEAR=%i MV=%i T(%i,%i,%i) RESET=%i, LIMIT=%i, qbpp=%i, RANGE=%i\n",s->width,s->height,state->near,state->maxval,state->T1,state->T2,state->T3,state->reset,state->limit,state->qbpp, state->range);
287 287
 //    av_log(s->avctx, AV_LOG_DEBUG, "JPEG params: ILV=%i Pt=%i BPP=%i, scan = %i\n", ilv, point_transform, s->bits, s->cur_scan);
288 288
     if(ilv == 0) { /* separate planes */
289
-        off = s->cur_scan - 1;
290 289
         stride = (s->nb_components > 1) ? 3 : 1;
290
+        off = av_clip(s->cur_scan - 1, 0, stride);
291 291
         width = s->width * stride;
292 292
         cur += off;
293 293
         for(i = 0; i < s->height; i++) {