diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-21 03:28:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-21 03:28:00 +0100 |
| commit | a92cdd8963459d108d701ea7a77a4e2074278276 (patch) | |
| tree | 02b8bc86af730a88834ad084dba71cd1fbbeda48 /libavcodec/tiff.c | |
| parent | f86da592c3399c749442d8e70d9aef346dac3464 (diff) | |
| parent | dfeef3a209ecb3dcf01a1ad14e7fc4586e630e93 (diff) | |
| download | ffmpeg-a92cdd8963459d108d701ea7a77a4e2074278276.tar.gz | |
Merge branch 'release/0.8' into release/0.7
* release/0.8:
cook: check js_subband_start for validity
avcodec_align_dimensions2: Ensure cinepak has large enough buffers.
Update for 0.8.14
qdm2: increase noise_table size
wma: check byte_offset_bits
tiff: check bppcount
vqavideo: fix return type
Conflicts:
Doxyfile
RELEASE
VERSION
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 2ca6d5ca62..d26135ecda 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -360,6 +360,11 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t * "Samples per pixel requires a single value, many provided\n"); return AVERROR_INVALIDDATA; } + if (value > 4U) { + av_log(s->avctx, AV_LOG_ERROR, + "Samples per pixel %d is too large\n", value); + return AVERROR_INVALIDDATA; + } if (s->bppcount == 1) s->bpp *= value; s->bppcount = value; |