diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 21:42:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 21:42:36 +0100 |
| commit | 575ed4fe37fdb1558fbbc261661b6239d47bcd8c (patch) | |
| tree | 0113e668e92ff3f8197e823d72f15ee37598761a /libavformat/rdt.c | |
| parent | beae6ac5db9deee4a93a0c8e6e965ed31463ab93 (diff) | |
| parent | da7e31a240f276836a0b90ca6c0714181b353cc4 (diff) | |
| download | ffmpeg-575ed4fe37fdb1558fbbc261661b6239d47bcd8c.tar.gz | |
Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4'
* commit 'da7e31a240f276836a0b90ca6c0714181b353cc4':
rmdec: Check memory allocations from ff_rm_alloc_rmstream()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rdt.c')
| -rw-r--r-- | libavformat/rdt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rdt.c b/libavformat/rdt.c index 212e139f31..e799770fe2 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -434,6 +434,8 @@ rdt_parse_sdp_line (AVFormatContext *s, int st_index, rdt->nb_rmst = count; } 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); } } |