diff options
| author | Nicolas Bertrand <nicoinattendu@gmail.com> | 2013-04-30 11:09:55 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-05-06 13:07:00 +0200 |
| commit | 28816f9db877cbdd2c2dcfeb089885617181fc7a (patch) | |
| tree | 34cf332ce9e9f3e6b57bb4b1842589000b6d7a46 | |
| parent | 110796739ab32854dc0b6b0a1c95e6ae98889062 (diff) | |
| download | ffmpeg-28816f9db877cbdd2c2dcfeb089885617181fc7a.tar.gz | |
jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck
Signed-off-by: Diego Biurrun <diego@biurrun.de>
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index f789d196dd..d29789f60d 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -635,7 +635,14 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Cblk *cblk = prec->cblk + cblkno; if (s->buf_end - s->buf < cblk->lengthinc) return AVERROR(EINVAL); - bytestream_get_buffer(&s->buf, cblk->data, cblk->lengthinc); + /* Code-block data can be empty. In that case initialize data + * with 0xFFFF. */ + if (cblk->lengthinc > 0) { + bytestream_get_buffer(&s->buf, cblk->data, cblk->lengthinc); + } else { + cblk->data[0] = 0xFF; + cblk->data[1] = 0xFF; + } cblk->length += cblk->lengthinc; cblk->lengthinc = 0; } @@ -853,11 +860,13 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, { int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1, y; - for (y = 0; y < height + 2; y++) - memset(t1->flags[y], 0, (width + 2) * sizeof(width)); - for (y = 0; y < height; y++) memset(t1->data[y], 0, width * sizeof(width)); + /* If code-block contains no compressed data: nothing to do. */ + if (!cblk->length) + return 0; + for (y = 0; y < height + 2; y++) + memset(t1->flags[y], 0, (width + 2) * sizeof(width)); ff_mqc_initdec(&t1->mqc, cblk->data); cblk->data[cblk->length] = 0xff; |