diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 12:56:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 13:02:08 +0200 |
| commit | f1b15c1ef9d8d69b3c8687c0eb34edc7a1d8687a (patch) | |
| tree | 06c03077ac7ea5f8b14bc4c07f09edc27df11ef2 /libavcodec | |
| parent | 9411e9cafb524baeef054b6afd4d3927d2556869 (diff) | |
| parent | 35cbc98b720db95b923cb2d745f77bb2ee4363dc (diff) | |
| download | ffmpeg-f1b15c1ef9d8d69b3c8687c0eb34edc7a1d8687a.tar.gz | |
Merge commit '35cbc98b720db95b923cb2d745f77bb2ee4363dc'
* commit '35cbc98b720db95b923cb2d745f77bb2ee4363dc':
alac: Check that the channels fit at the given offset
Conflicts:
libavcodec/alac.c
See: b53f89710b03c4c832bb03e4e132b1ace17fb4e4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/alac.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index c714d40841..69384dc432 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -463,9 +463,8 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data, } channels = (element == TYPE_CPE) ? 2 : 1; - if ( ch + channels > alac->channels - || ff_alac_channel_layout_offsets[alac->channels - 1][ch] + channels > alac->channels - ) { + if (ch + channels > alac->channels || + ff_alac_channel_layout_offsets[alac->channels - 1][ch] + channels > alac->channels) { av_log(avctx, AV_LOG_ERROR, "invalid element channel count\n"); return AVERROR_INVALIDDATA; } |