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

Merged revisions 66076 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r66076 | russell | 2007-05-24 17:23:59 -0500 (Thu, 24 May 2007) | 1 line

if the string field init fails, clean up the stuff that was allocated already
........


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

diff --git a/main/channel.c b/main/channel.c
index 6522837edb..d75e98306d 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -652,8 +652,11 @@ struct ast_channel *ast_channel_alloc(int needqueue, int state, const char *cid_
 		return NULL;
 	}
 	
-	if ((ast_string_field_init(tmp, 128)))
+	if ((ast_string_field_init(tmp, 128))) {
+		sched_context_destroy(tmp->sched);
+		free(tmp);
 		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,