highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xmv: validate sample_rate

Browse Source 
AVCodecParameters.sample_rate is a signed integer, so
XMVAudioPacket.sample_rate should be, too.

A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun
2016-10-23 17:25:15 +02:00
parent 54b8fbbc5d
commit 34aeb5dbc4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/xmv.c
View File

@@ -77,7 +77,7 @@ typedef struct XMVAudioPacket {
/* Stream format properties. */ /* Stream format properties. */
uint16_t compression; ///< The type of compression. uint16_t compression; ///< The type of compression.
uint16_t channels; ///< Number of channels. uint16_t channels; ///< Number of channels.
uint32_t sample_rate; ///< Sampling rate. int32_t sample_rate; ///< Sampling rate.
uint16_t bits_per_sample; ///< Bits per compressed sample. uint16_t bits_per_sample; ///< Bits per compressed sample.
uint32_t bit_rate; ///< Bits of compressed data per second. uint32_t bit_rate; ///< Bits of compressed data per second.
uint16_t flags; ///< Flags uint16_t flags; ///< Flags
@@ -210,7 +210,7 @@ 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 <= 0 ||
packet->channels >= UINT16_MAX / XMV_BLOCK_ALIGN_SIZE) { packet->channels >= UINT16_MAX / XMV_BLOCK_ALIGN_SIZE) {
av_log(s, AV_LOG_ERROR, "Invalid parameters for audio track %"PRIu16".\n", av_log(s, AV_LOG_ERROR, "Invalid parameters for audio track %"PRIu16".\n",
audio_track); audio_track);