| Message ID | 20211225224213.9698-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | afdbc940c6011b64c1856f88d2b0609369f87406 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/tiff: Remove messing with jpeg context | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | fail | Make fate failed |
Please confirm you are not breaking tile files in any way. On Sat, Dec 25, 2021 at 11:43 PM Michael Niedermayer <michael@niedermayer.cc> wrote: > The whole concept is just not correct, also as it seems not to be needed > at all, all dng files i have decode without this. > > Fixes: various crashes > Fixes: > 42937/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4625073334517760 > Fixes: > 42938/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4643368217477120 > Fixes: > 42939/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4925325908246528 > Fixes: > 42940/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4925378806808576 > Fixes: > 42941/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-6202009265504256 > Fixes: > 42944/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-6076860998483968 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by > <https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by>: > Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/tiff.c | 24 ++---------------------- > 1 file changed, 2 insertions(+), 22 deletions(-) > > diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c > index 60773d59ed0..fd85d104dc4 100644 > --- a/libavcodec/tiff.c > +++ b/libavcodec/tiff.c > @@ -721,20 +721,6 @@ static int dng_decode_jpeg(AVCodecContext *avctx, > AVFrame *frame, > return 0; > } > > -static int dng_decode_strip(AVCodecContext *avctx, AVFrame *frame) > -{ > - TiffContext *s = avctx->priv_data; > - int ret = ff_set_dimensions(s->avctx_mjpeg, s->width, s->height); > - > - if (ret < 0) > - return ret; > - > - s->jpgframe->width = s->width; > - s->jpgframe->height = s->height; > - > - return dng_decode_jpeg(avctx, frame, s->stripsize, 0, 0, s->width, > s->height); > -} > - > static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, > int stride, > const uint8_t *src, int size, int > strip_start, int lines) > { > @@ -856,7 +842,7 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame > *p, uint8_t *dst, int strid > av_log(s->avctx, AV_LOG_ERROR, "More than one DNG JPEG strips > unsupported\n"); > return AVERROR_PATCHWELCOME; > } > - if ((ret = dng_decode_strip(s->avctx, p)) < 0) > + if ((ret = dng_decode_jpeg(s->avctx, p, s->stripsize, 0, 0, > s->width, s->height)) < 0) > return ret; > return 0; > } > @@ -972,13 +958,7 @@ static int dng_decode_tiles(AVCodecContext *avctx, > AVFrame *frame, > int has_width_leftover, has_height_leftover; > int tile_x = 0, tile_y = 0; > int pos_x = 0, pos_y = 0; > - int ret = ff_set_dimensions(s->avctx_mjpeg, s->tile_width, > s->tile_length); > - > - if (ret < 0) > - return ret; > - > - s->jpgframe->width = s->tile_width; > - s->jpgframe->height = s->tile_length; > + int ret; > > has_width_leftover = (s->width % s->tile_width != 0); > has_height_leftover = (s->height % s->tile_length != 0); > -- > 2.17.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
On Sun, Dec 26, 2021 at 09:50:28AM +0100, Paul B Mahol wrote:
> Please confirm you are not breaking tile files in any way.
Ive tested both strip and tile dng/tiff files
Thats what i tested with:
1_1.1.1.dpx
1_1.2.1.dpx
1_1.3.1.dpx
A001_C022_20171009_R00100.dng
Footage_01/A003_C001_20170717_R00446.dng
RAW_ONEPLUS_ONE-A0001.DNG
SCANNER_NIKON_LS5000.DNG
pentax_k1_69.dng
z8pf.dng
00119443.DNG
IMG_3459.dng
if you have files which cover other configurations, iam happy to test them too
thx
[...]
On Sun, Dec 26, 2021 at 02:34:25PM +0100, Michael Niedermayer wrote: > On Sun, Dec 26, 2021 at 09:50:28AM +0100, Paul B Mahol wrote: > > Please confirm you are not breaking tile files in any way. > > Ive tested both strip and tile dng/tiff files > > Thats what i tested with: > > 1_1.1.1.dpx > 1_1.2.1.dpx > 1_1.3.1.dpx > A001_C022_20171009_R00100.dng > Footage_01/A003_C001_20170717_R00446.dng > RAW_ONEPLUS_ONE-A0001.DNG > SCANNER_NIKON_LS5000.DNG > pentax_k1_69.dng > z8pf.dng > 00119443.DNG > IMG_3459.dng > > if you have files which cover other configurations, iam happy to test them too will apply [...]
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 60773d59ed0..fd85d104dc4 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -721,20 +721,6 @@ static int dng_decode_jpeg(AVCodecContext *avctx, AVFrame *frame, return 0; } -static int dng_decode_strip(AVCodecContext *avctx, AVFrame *frame) -{ - TiffContext *s = avctx->priv_data; - int ret = ff_set_dimensions(s->avctx_mjpeg, s->width, s->height); - - if (ret < 0) - return ret; - - s->jpgframe->width = s->width; - s->jpgframe->height = s->height; - - return dng_decode_jpeg(avctx, frame, s->stripsize, 0, 0, s->width, s->height); -} - static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int stride, const uint8_t *src, int size, int strip_start, int lines) { @@ -856,7 +842,7 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid av_log(s->avctx, AV_LOG_ERROR, "More than one DNG JPEG strips unsupported\n"); return AVERROR_PATCHWELCOME; } - if ((ret = dng_decode_strip(s->avctx, p)) < 0) + if ((ret = dng_decode_jpeg(s->avctx, p, s->stripsize, 0, 0, s->width, s->height)) < 0) return ret; return 0; } @@ -972,13 +958,7 @@ static int dng_decode_tiles(AVCodecContext *avctx, AVFrame *frame, int has_width_leftover, has_height_leftover; int tile_x = 0, tile_y = 0; int pos_x = 0, pos_y = 0; - int ret = ff_set_dimensions(s->avctx_mjpeg, s->tile_width, s->tile_length); - - if (ret < 0) - return ret; - - s->jpgframe->width = s->tile_width; - s->jpgframe->height = s->tile_length; + int ret; has_width_leftover = (s->width % s->tile_width != 0); has_height_leftover = (s->height % s->tile_length != 0);
The whole concept is just not correct, also as it seems not to be needed at all, all dng files i have decode without this. Fixes: various crashes Fixes: 42937/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4625073334517760 Fixes: 42938/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4643368217477120 Fixes: 42939/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4925325908246528 Fixes: 42940/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4925378806808576 Fixes: 42941/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-6202009265504256 Fixes: 42944/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-6076860998483968 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/tiff.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-)