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

Merge commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68'

Browse Source 
* commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68':
  xmv: Add more sanity checks for parameters read from the bitstream

Conflicts:
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-18 11:24:27 +02:00
commit 46cc498b77
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/xmv.c
View File

@ -49,6 +49,8 @@
XMV_AUDIO_ADPCM51_FRONTCENTERLOW | \ XMV_AUDIO_ADPCM51_FRONTCENTERLOW | \
XMV_AUDIO_ADPCM51_REARLEFTRIGHT) XMV_AUDIO_ADPCM51_REARLEFTRIGHT)
#define XMV_BLOCK_ALIGN_SIZE 36
/** A video packet with an XMV file. */ /** A video packet with an XMV file. */
typedef struct XMVVideoPacket { typedef struct XMVVideoPacket {
int stream_index; ///< The decoder stream index for this video packet. int stream_index; ///< The decoder stream index for this video packet.
@ -199,7 +201,7 @@ static int xmv_read_header(AVFormatContext *s)
packet->bit_rate = packet->bits_per_sample * packet->bit_rate = packet->bits_per_sample *
packet->sample_rate * packet->sample_rate *
packet->channels; packet->channels;
packet->block_align = 36 * packet->channels; packet->block_align = XMV_BLOCK_ALIGN_SIZE * packet->channels;
packet->block_samples = 64; packet->block_samples = 64;
packet->codec_id = ff_wav_codec_get_id(packet->compression, packet->codec_id = ff_wav_codec_get_id(packet->compression,
packet->bits_per_sample); packet->bits_per_sample);
@ -215,7 +217,8 @@ static int xmv_read_header(AVFormatContext *s)
av_log(s, AV_LOG_WARNING, "Unsupported 5.1 ADPCM audio stream " av_log(s, AV_LOG_WARNING, "Unsupported 5.1 ADPCM audio stream "
"(0x%04X)\n", packet->flags); "(0x%04X)\n", packet->flags);
if (!packet->channels || !packet->sample_rate) { if (!packet->channels || !packet->sample_rate ||
packet->channels >= UINT16_MAX / XMV_BLOCK_ALIGN_SIZE) {
av_log(s, AV_LOG_ERROR, "Invalid parameters for audio track %d.\n", av_log(s, AV_LOG_ERROR, "Invalid parameters for audio track %d.\n",
audio_track); audio_track);
ret = AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;