From f73f76fd202b310e8e1d0215b2e0cf038cd18c4a Mon Sep 17 00:00:00 2001 From: Xi Wang Date: Fri, 4 Jan 2013 21:15:33 +0000 Subject: swscale: fix NULL checking in sws_alloc_context() sws_getCachedContext() and sws_getContext() expect sws_alloc_context() to return NULL when out of memory, as follows. if (!(context = sws_alloc_context())) return NULL; This patch fixes sws_alloc_context() to return NULL in that case. Signed-off-by: Xi Wang Signed-off-by: Derek Buitenhuis --- libswscale/utils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libswscale/utils.c') diff --git a/libswscale/utils.c b/libswscale/utils.c index e5e4d60dd2..f0a2b464fc 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -844,8 +844,10 @@ SwsContext *sws_alloc_context(void) { SwsContext *c = av_mallocz(sizeof(SwsContext)); - c->av_class = &sws_context_class; - av_opt_set_defaults(c); + if (c) { + c->av_class = &sws_context_class; + av_opt_set_defaults(c); + } return c; } -- cgit v1.2.3