diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-09 14:43:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-09 14:43:03 +0200 |
| commit | b6ee1912f98d1db5f31b5d0c182181b79d9233df (patch) | |
| tree | 1c0230c7f4920bb891900f3c6a362c45312c339d | |
| parent | e60b018c7416a9a0608768703166973f37e5e326 (diff) | |
| download | ffmpeg-b6ee1912f98d1db5f31b5d0c182181b79d9233df.tar.gz | |
avcodec/jpeg2000dec: Handle Psot = 0
Fixes Ticket2869
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index ba0d259778..c5a3bd26e6 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -602,6 +602,9 @@ static int get_sot(Jpeg2000DecoderContext *s, int n) /* Read TNSot but not used */ bytestream2_get_byteu(&s->g); // TNsot + if (!Psot) + Psot = bytestream2_get_bytes_left(&s->g) + n + 2; + if (Psot > bytestream2_get_bytes_left(&s->g) + n + 2) { av_log(s->avctx, AV_LOG_ERROR, "Psot %"PRIu32" too big\n", Psot); return AVERROR_INVALIDDATA; |