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

oma: Validate sample rates

Browse Source 
The sample rate index is 3 bits even if currently index 5, 6 and 7 are
not supported.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 0933fd1533)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Luca Barbato
2013-03-30 09:46:06 +01:00
committed by Reinhard Tartler
parent fc6825ebb6
commit c0f7df9662
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/oma.c
View File

@@ -22,7 +22,7 @@
#include "oma.h" #include "oma.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
const uint16_t ff_oma_srate_tab[6] = { 320, 441, 480, 882, 960, 0 }; const uint16_t ff_oma_srate_tab[8] = { 320, 441, 480, 882, 960, 0 };
const AVCodecTag ff_oma_codec_tags[] = { const AVCodecTag ff_oma_codec_tags[] = {
{ AV_CODEC_ID_ATRAC3, OMA_CODECID_ATRAC3 }, { AV_CODEC_ID_ATRAC3, OMA_CODECID_ATRAC3 },

2
libavformat/oma.h
View File

@@ -37,7 +37,7 @@ enum {
OMA_CODECID_WMA = 5, OMA_CODECID_WMA = 5,
}; };
extern const uint16_t ff_oma_srate_tab[6]; extern const uint16_t ff_oma_srate_tab[8];
extern const AVCodecTag ff_oma_codec_tags[]; extern const AVCodecTag ff_oma_codec_tags[];

17
libavformat/omadec.c
View File

@@ -304,7 +304,11 @@ static int oma_read_header(AVFormatContext *s)
switch (buf[32]) { switch (buf[32]) {
case OMA_CODECID_ATRAC3: case OMA_CODECID_ATRAC3:
samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7]*100; samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100;
if (!samplerate) {
av_log(s, AV_LOG_ERROR, "Unsupported sample rate\n");
return AVERROR_INVALIDDATA;
}
if (samplerate != 44100) if (samplerate != 44100)
av_log_ask_for_sample(s, "Unsupported sample rate: %d\n", av_log_ask_for_sample(s, "Unsupported sample rate: %d\n",
samplerate); samplerate);
@@ -335,9 +339,14 @@ static int oma_read_header(AVFormatContext *s)
case OMA_CODECID_ATRAC3P: case OMA_CODECID_ATRAC3P:
st->codec->channels = (codec_params >> 10) & 7; st->codec->channels = (codec_params >> 10) & 7;
framesize = ((codec_params & 0x3FF) * 8) + 8; framesize = ((codec_params & 0x3FF) * 8) + 8;
st->codec->sample_rate = ff_oma_srate_tab[(codec_params >> 13) & 7]*100; samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100;
st->codec->bit_rate = st->codec->sample_rate * framesize * 8 / 1024; if (!samplerate) {
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); av_log(s, AV_LOG_ERROR, "Unsupported sample rate\n");
return AVERROR_INVALIDDATA;
}
st->codec->sample_rate = samplerate;
st->codec->bit_rate = samplerate * framesize * 8 / 1024;
avpriv_set_pts_info(st, 64, 1, samplerate);
av_log(s, AV_LOG_ERROR, "Unsupported codec ATRAC3+!\n"); av_log(s, AV_LOG_ERROR, "Unsupported codec ATRAC3+!\n");
break; break;
case OMA_CODECID_MP3: case OMA_CODECID_MP3: