mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
flacdec: Avoid trying to read 33 bits. This occurs when the source
is 32 bits-per-sample and channel decorrelation is used. Such files are valid, but not supported currently. Originally committed as revision 17743 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
505cc62f75
commit
5b37e2fc9a
@ -37,6 +37,7 @@
|
||||
|
||||
#include "libavutil/crc.h"
|
||||
#include "avcodec.h"
|
||||
#include "internal.h"
|
||||
#include "bitstream.h"
|
||||
#include "golomb.h"
|
||||
#include "flac.h"
|
||||
@ -429,6 +430,10 @@ static inline int decode_subframe(FLACContext *s, int channel)
|
||||
if (s->decorrelation == LEFT_SIDE || s->decorrelation == MID_SIDE)
|
||||
s->curr_bps++;
|
||||
}
|
||||
if (s->curr_bps > 32) {
|
||||
ff_log_missing_feature(s->avctx, "decorrelated bit depth > 32", 0);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (get_bits1(&s->gb)) {
|
||||
av_log(s->avctx, AV_LOG_ERROR, "invalid subframe padding\n");
|
||||
|
Loading…
Reference in New Issue
Block a user