diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 10:40:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 10:41:06 +0100 |
| commit | 7fd7a10efde79098b7ea48aaf92a6be4c6d67f82 (patch) | |
| tree | 0e4a608ae4098dca18cc82a42d9504d5713ad974 /libavformat/oggparsetheora.c | |
| parent | 0b9e480b8f3be266acf708bbab80d53bb7f48b7d (diff) | |
| parent | 4f2d8968c04ef76bb18df103a1287b864c0e6fe6 (diff) | |
| download | ffmpeg-7fd7a10efde79098b7ea48aaf92a6be4c6d67f82.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
oggparsetheora: check av_mallocz result
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparsetheora.c')
| -rw-r--r-- | libavformat/oggparsetheora.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c index 4508111fea..0a0ea06785 100644 --- a/libavformat/oggparsetheora.c +++ b/libavformat/oggparsetheora.c @@ -50,6 +50,8 @@ static int theora_header(AVFormatContext *s, int idx) if (!thp) { thp = av_mallocz(sizeof(*thp)); + if (!thp) + return AVERROR(ENOMEM); os->private = thp; } |