diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2013-10-22 16:11:11 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2013-10-22 17:08:10 +0100 |
commit | 55ae13e3deffa21027a44f31b4ae2f53a4fa7426 (patch) | |
tree | 5603fc52d97069533f98bb2cb628a83b06e28c7e /libavformat/nut.c | |
parent | 692b93090443519c407834fc61e78b23a9019ac2 (diff) | |
download | ffmpeg-55ae13e3deffa21027a44f31b4ae2f53a4fa7426.tar.gz |
nut: Fix unchecked allocations
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/nut.c')
-rw-r--r-- | libavformat/nut.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c index 7e7997998f..8b8a4cb8ac 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -227,11 +227,17 @@ int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b) return ((a->ts - b->ts) >> 32) - ((b->ts - a->ts) >> 32); } -void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts) +int ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts) { Syncpoint *sp = av_mallocz(sizeof(Syncpoint)); struct AVTreeNode *node = av_tree_node_alloc(); + if (!sp || !node) { + av_freep(&sp); + av_freep(&node); + return AVERROR(ENOMEM); + } + nut->sp_count++; sp->pos = pos; @@ -242,6 +248,8 @@ void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts) av_free(sp); av_free(node); } + + return 0; } static int enu_free(void *opaque, void *elem) |