virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

Merge commit 'c837b38dd33a11c3810e988a60193a858eb4f58c'

Browse Source 
* commit 'c837b38dd33a11c3810e988a60193a858eb4f58c':
  au: move skipping of unused data to before parameter validation
  au: do not arbitrarily limit channel count

Conflicts:
	libavformat/au.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-01-10 11:12:08 +01:00
parent 0287eea914 c837b38dd3
commit be894d6cae
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/au.c
View File

@ -63,6 +63,8 @@ static int au_probe(AVProbeData *p)
return 0; return 0;
} }
#define BLOCK_SIZE 1024
/* au input */ /* au input */
static int au_read_header(AVFormatContext *s) static int au_read_header(AVFormatContext *s)
{ {
@ -90,6 +92,11 @@ static int au_read_header(AVFormatContext *s)
rate = avio_rb32(pb); rate = avio_rb32(pb);
channels = avio_rb32(pb); channels = avio_rb32(pb);
if (size > 24) {
/* skip unused data */
avio_skip(pb, size - 24);
}
codec = ff_codec_get_id(codec_au_tags, id); codec = ff_codec_get_id(codec_au_tags, id);
if (codec == AV_CODEC_ID_NONE) { if (codec == AV_CODEC_ID_NONE) {
@ -103,16 +110,11 @@ static int au_read_header(AVFormatContext *s)
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
if (channels == 0 || channels > 64) { if (channels == 0 || channels >= INT_MAX / (BLOCK_SIZE * bps >> 3)) {
av_log(s, AV_LOG_ERROR, "Invalid number of channels %d\n", channels); av_log(s, AV_LOG_ERROR, "Invalid number of channels %d\n", channels);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (size >= 24) {
/* skip unused data */
avio_skip(pb, size - 24);
}
/* now we are ready: build format streams */ /* now we are ready: build format streams */
st = avformat_new_stream(s, NULL); st = avformat_new_stream(s, NULL);
if (!st) if (!st)