diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2013-10-22 16:11:11 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2014-01-06 02:31:05 +0000 |
| commit | 5ae7ed3aa4f3f4ed07677edeb6edebf9967caa82 (patch) | |
| tree | e4ca0a184dc99f1f056d08bf4c2d1f2ba60ea895 /libavformat/nut.c | |
| parent | 61057f4604eb909ac2b37f08c7d2b0ed758fd4bf (diff) | |
| download | ffmpeg-5ae7ed3aa4f3f4ed07677edeb6edebf9967caa82.tar.gz | |
nut: Fix unchecked allocations
CC: libav-stable@libav.org
(cherry picked from commit b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4)
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 196e04e54f..65d84d1d41 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -179,10 +179,16 @@ 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); + } + sp->pos= pos; sp->back_ptr= back_ptr; sp->ts= ts; @@ -191,6 +197,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) |