]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 66070 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 24 May 2007 22:08:33 +0000 (22:08 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 24 May 2007 22:08:33 +0000 (22:08 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r66070 | russell | 2007-05-24 17:07:39 -0500 (Thu, 24 May 2007) | 2 lines

Check the result of ast_string_field_init() in ast_channel_alloc()

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66072 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/channel.c

index 8303ce8c6949083d87dfbb5816bef84985a965ee..6522837edb9fe162ec47049d48f1713007a1cb98 100644 (file)
@@ -652,7 +652,8 @@ struct ast_channel *ast_channel_alloc(int needqueue, int state, const char *cid_
                return NULL;
        }
        
-       ast_string_field_init(tmp, 128);
+       if ((ast_string_field_init(tmp, 128)))
+               return NULL;
 
        /* Don't bother initializing the last two FD here, because they
           will *always* be set just a few lines down (AST_TIMING_FD,