RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ADTS Muxer: Refuse to write illegal ADTS files by checking validity of header 

members and erroring out if invalid

Patch by Alex Converse ( alex converse gmail com )

Originally committed as revision 17193 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2009-02-12 23:51:08 +00:00 committed by Robert Swain
parent 5110b25e1e
commit dd44d9e316
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/adtsenc.c
View File

@ -32,7 +32,7 @@ typedef struct {
int channel_conf; int channel_conf;
} ADTSContext; } ADTSContext;
static int decode_extradata(ADTSContext *adts, uint8_t *buf, int size) static int decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t *buf, int size)
{ {
GetBitContext gb; GetBitContext gb;
@ -41,6 +41,19 @@ static int decode_extradata(ADTSContext *adts, uint8_t *buf, int size)
adts->sample_rate_index = get_bits(&gb, 4); adts->sample_rate_index = get_bits(&gb, 4);
adts->channel_conf = get_bits(&gb, 4); adts->channel_conf = get_bits(&gb, 4);
if (adts->objecttype > 3) {
av_log(s, AV_LOG_ERROR, "MPEG-4 AOT %d is not allowed in ADTS\n", adts->objecttype);
return -1;
}
if (adts->sample_rate_index == 15) {
av_log(s, AV_LOG_ERROR, "Escape sample rate index illegal in ADTS\n");
return -1;
}
if (adts->channel_conf == 0) {
ff_log_missing_feature(s, "PCE based channel configuration", 0);
return -1;
}
adts->write_adts = 1; adts->write_adts = 1;
return 0; return 0;
@ -51,8 +64,9 @@ static int adts_write_header(AVFormatContext *s)
ADTSContext *adts = s->priv_data; ADTSContext *adts = s->priv_data;
AVCodecContext *avc = s->streams[0]->codec; AVCodecContext *avc = s->streams[0]->codec;
if(avc->extradata_size > 0) if(avc->extradata_size > 0 &&
decode_extradata(adts, avc->extradata, avc->extradata_size); decode_extradata(s, adts, avc->extradata, avc->extradata_size) < 0)
return -1;
return 0; return 0;
} }