From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 24 May 2007 22:08:33 +0000 (+0000)
Subject: Merged revisions 66070 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2577
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9065eb1054b279a98bdef06070428a068e180900;p=thirdparty%2Fasterisk.git

Merged revisions 66070 via svnmerge from
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
---

diff --git a/main/channel.c b/main/channel.c
index 8303ce8c69..6522837edb 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -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,