Browse Source

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>
Michael Niedermayer 2 years ago
parent
commit
9b6d191a66
1 changed files with 5 additions and 0 deletions
  1. 5 0
      libavcodec/jpeg2000dec.c

+ 5 - 0
libavcodec/jpeg2000dec.c

@@ -238,6 +238,11 @@ static int get_siz(Jpeg2000DecoderContext *s)
         return AVERROR_INVALIDDATA;
         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;
     s->ncomponents = ncomponents;
 
 
     if (s->tile_width <= 0 || s->tile_height <= 0) {
     if (s->tile_width <= 0 || s->tile_height <= 0) {