virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

rmdec: Check memory allocations from ff_rm_alloc_rmstream()

Browse Source 
Bug-Id: CID 1257835
This commit is contained in:
Hugo Beauzée-Luyssen
2015-02-01 19:19:46 +01:00
committed by Vittorio Giovara
parent d89e58f539
commit da7e31a240
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rdt.c
View File

@@ -434,6 +434,8 @@ rdt_parse_sdp_line (AVFormatContext *s, int st_index,
rdt->nb_rmst = count; rdt->nb_rmst = count;
} }
rdt->rmst[s->streams[n]->index] = ff_rm_alloc_rmstream(); rdt->rmst[s->streams[n]->index] = ff_rm_alloc_rmstream();
if (!rdt->rmst[s->streams[n]->index])
return AVERROR(ENOMEM);
rdt_load_mdpr(rdt, s->streams[n], (n - first) * 2); rdt_load_mdpr(rdt, s->streams[n], (n - first) * 2);
} }
} }

6
libavformat/rmdec.c
View File

@@ -109,6 +109,8 @@ static void rm_read_metadata(AVFormatContext *s, AVIOContext *pb, int wide)
RMStream *ff_rm_alloc_rmstream (void) RMStream *ff_rm_alloc_rmstream (void)
{ {
RMStream *rms = av_mallocz(sizeof(RMStream)); RMStream *rms = av_mallocz(sizeof(RMStream));
if (!rms)
return NULL;
rms->curpic_num = -1; rms->curpic_num = -1;
return rms; return rms;
} }
@@ -416,6 +418,8 @@ static int rm_read_header_old(AVFormatContext *s)
if (!st) if (!st)
return -1; return -1;
st->priv_data = ff_rm_alloc_rmstream(); st->priv_data = ff_rm_alloc_rmstream();
if (!st->priv_data)
return AVERROR(ENOMEM);
return rm_read_audio_stream_info(s, s->pb, st, st->priv_data, 1); return rm_read_audio_stream_info(s, s->pb, st, st->priv_data, 1);
} }
@@ -493,6 +497,8 @@ static int rm_read_header(AVFormatContext *s)
get_str8(pb, buf, sizeof(buf)); /* mimetype */ get_str8(pb, buf, sizeof(buf)); /* mimetype */
st->codec->codec_type = AVMEDIA_TYPE_DATA; st->codec->codec_type = AVMEDIA_TYPE_DATA;
st->priv_data = ff_rm_alloc_rmstream(); st->priv_data = ff_rm_alloc_rmstream();
if (!st->priv_data)
return AVERROR(ENOMEM);
if (ff_rm_read_mdpr_codecdata(s, s->pb, st, st->priv_data, if (ff_rm_read_mdpr_codecdata(s, s->pb, st, st->priv_data,
avio_rb32(pb)) < 0) avio_rb32(pb)) < 0)
return -1; return -1;