diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 23:27:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 13:04:31 +0100 |
| commit | a156f86e911a199d61251b69fc68bae452d15f3f (patch) | |
| tree | cabf8eb5e008ab8ed3e48f8e30f2296d1eb8b550 | |
| parent | 3586314147fa38ba5394bfc9ceb75782ba088a41 (diff) | |
| download | ffmpeg-a156f86e911a199d61251b69fc68bae452d15f3f.tar.gz | |
avcodec/tiff: move bpp check to after "end:"
This ensures that all current and future code-pathes get bpp checked
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d5e9fc782150d4596c72440a0aa02b7f4f1254b1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/tiff.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 4fe1168774..151e501c29 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -839,13 +839,6 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) s->bpp = -1; } } - if (s->bpp > 64U) { - av_log(s->avctx, AV_LOG_ERROR, - "This format is not supported (bpp=%d, %d components)\n", - s->bpp, count); - s->bpp = 0; - return AVERROR_INVALIDDATA; - } break; case TIFF_SAMPLES_PER_PIXEL: if (count != 1) { @@ -1158,6 +1151,13 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) } } end: + if (s->bpp > 64U) { + av_log(s->avctx, AV_LOG_ERROR, + "This format is not supported (bpp=%d, %d components)\n", + s->bpp, count); + s->bpp = 0; + return AVERROR_INVALIDDATA; + } bytestream2_seek(&s->gb, start, SEEK_SET); return 0; } |