Browse Source

avcodec/jpeg2000dec: account two last bytes from end of bytestream as EOC marker

This silences missing EOC marker when decoding j2k files with Psot set to 0.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
tags/n3.1
Paul B Mahol 10 years ago
parent
commit
e2298b3fcc
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavcodec/jpeg2000dec.c

+ 2
- 2
libavcodec/jpeg2000dec.c View File

@@ -737,9 +737,9 @@ static int get_sot(Jpeg2000DecoderContext *s, int n)
bytestream2_get_byteu(&s->g); // TNsot

if (!Psot)
Psot = bytestream2_get_bytes_left(&s->g) + n + 2;
Psot = bytestream2_get_bytes_left(&s->g) - 2 + n + 2;

if (Psot > bytestream2_get_bytes_left(&s->g) + n + 2) {
if (Psot > bytestream2_get_bytes_left(&s->g) - 2 + n + 2) {
av_log(s->avctx, AV_LOG_ERROR, "Psot %"PRIu32" too big\n", Psot);
return AVERROR_INVALIDDATA;
}


Loading…
Cancel
Save