mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-13 21:28:01 +02:00
avcodec/jpeg2000dec: Check for reduction factor and image offset
This combination is not working (it writes out of array)
Reviewed-by: Tomas Härdin <git@haerdin.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9b6d191a66
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
949636ca60
commit
53e3119d0f
@ -317,6 +317,11 @@ static int get_siz(Jpeg2000DecoderContext *s)
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
if (s->reduction_factor && (s->image_offset_x || s->image_offset_y) ){
|
||||
av_log(s->avctx, AV_LOG_ERROR, "reduction factor with image offsets is not fully implemented");
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
s->ncomponents = ncomponents;
|
||||
|
||||
if (s->tile_width <= 0 || s->tile_height <= 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user