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

rm_read_audio_stream_info return type is not void

Browse Source 
Check for errors returned by rm_read_audio_stream_info
Check for overflow in aac extradata allocation

Originally committed as revision 5455 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Roberto Togni 2006-06-04 21:01:02 +00:00
parent a194f595c8
commit a9d4a6ef34
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/rm.c
View File

@ -484,7 +484,7 @@ static void get_str8(ByteIOContext *pb, char *buf, int buf_size)
*q = '\0'; *q = '\0';
} }
static void rm_read_audio_stream_info(AVFormatContext *s, AVStream *st, static int rm_read_audio_stream_info(AVFormatContext *s, AVStream *st,
int read_all) int read_all)
{ {
RMContext *rm = s->priv_data; RMContext *rm = s->priv_data;
@ -595,6 +595,10 @@ static void rm_read_audio_stream_info(AVFormatContext *s, AVStream *st,
get_byte(pb); get_byte(pb);
st->codec->codec_id = CODEC_ID_AAC; st->codec->codec_id = CODEC_ID_AAC;
codecdata_length = get_be32(pb); codecdata_length = get_be32(pb);
if(codecdata_length + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){
av_log(s, AV_LOG_ERROR, "codecdata_length too large\n");
return -1;
}
if (codecdata_length >= 1) { if (codecdata_length >= 1) {
st->codec->extradata_size = codecdata_length - 1; st->codec->extradata_size = codecdata_length - 1;
st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
@ -618,6 +622,7 @@ static void rm_read_audio_stream_info(AVFormatContext *s, AVStream *st,
get_str8(pb, s->comment, sizeof(s->comment)); get_str8(pb, s->comment, sizeof(s->comment));
} }
} }
return 0;
} }
static int rm_read_header_old(AVFormatContext *s, AVFormatParameters *ap) static int rm_read_header_old(AVFormatContext *s, AVFormatParameters *ap)
@ -628,11 +633,8 @@ static int rm_read_header_old(AVFormatContext *s, AVFormatParameters *ap)
rm->old_format = 1; rm->old_format = 1;
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
goto fail; return -1;
rm_read_audio_stream_info(s, st, 1); return rm_read_audio_stream_info(s, st, 1);
return 0;
fail:
return -1;
} }
static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap) static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
@ -722,7 +724,8 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
v = get_be32(pb); v = get_be32(pb);
if (v == MKTAG(0xfd, 'a', 'r', '.')) { if (v == MKTAG(0xfd, 'a', 'r', '.')) {
/* ra type header */ /* ra type header */
rm_read_audio_stream_info(s, st, 0); if (rm_read_audio_stream_info(s, st, 0))
return -1;
} else { } else {
int fps, fps2; int fps, fps2;
if (get_le32(pb) != MKTAG('V', 'I', 'D', 'O')) { if (get_le32(pb) != MKTAG('V', 'I', 'D', 'O')) {