generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mlpdec: Validate max_channel and max_matrix_channel.

Browse Source 
Originally committed as revision 18649 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2009-04-21 22:12:30 +00:00
parent 46958efe97
commit 868170c4da
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mlp.h
View File

@ -26,6 +26,9 @@
#include "avcodec.h" #include "avcodec.h"
/** Last possible matrix channel for each codec */
#define MAX_MATRIX_CHANNEL_MLP 5
#define MAX_MATRIX_CHANNEL_TRUEHD 7
/** Maximum number of channels that can be decoded. */ /** Maximum number of channels that can be decoded. */
#define MAX_CHANNELS 16 #define MAX_CHANNELS 16

16
libavcodec/mlpdec.c
View File

@ -335,6 +335,9 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
uint8_t checksum; uint8_t checksum;
uint8_t lossless_check; uint8_t lossless_check;
int start_count = get_bits_count(gbp); int start_count = get_bits_count(gbp);
const int max_matrix_channel = m->avctx->codec_id == CODEC_ID_MLP
? MAX_MATRIX_CHANNEL_MLP
: MAX_MATRIX_CHANNEL_TRUEHD;
sync_word = get_bits(gbp, 13); sync_word = get_bits(gbp, 13);
s->noise_type = get_bits1(gbp); s->noise_type = get_bits1(gbp);
@ -352,6 +355,19 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
s->max_channel = get_bits(gbp, 4); s->max_channel = get_bits(gbp, 4);
s->max_matrix_channel = get_bits(gbp, 4); s->max_matrix_channel = get_bits(gbp, 4);
if (s->max_matrix_channel > max_matrix_channel) {
av_log(m->avctx, AV_LOG_ERROR,
"Max matrix channel cannot be greater than %d.\n",
max_matrix_channel);
return -1;
}
if (s->max_channel != s->max_matrix_channel) {
av_log(m->avctx, AV_LOG_ERROR,
"Max channel must be equal max matrix channel.\n");
return -1;
}
if (s->min_channel > s->max_channel) { if (s->min_channel > s->max_channel) {
av_log(m->avctx, AV_LOG_ERROR, av_log(m->avctx, AV_LOG_ERROR,
"Substream min channel cannot be greater than max channel.\n"); "Substream min channel cannot be greater than max channel.\n");