Browse Source

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 <xi.wang@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
tags/n1.1
Xi Wang Derek Buitenhuis 12 years ago
parent
commit
f73f76fd20
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      libswscale/utils.c

+ 4
- 2
libswscale/utils.c View File

@@ -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;
}


Loading…
Cancel
Save