diff options
author | Russell Bryant <russell@russellbryant.com> | 2007-05-24 22:25:55 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2007-05-24 22:25:55 +0000 |
commit | 2b25070414f824f37468878d53013ad3848cab16 (patch) | |
tree | 6d475fb5ae5dcf61dbb5926be56be2fadcf4d09f /main | |
parent | 9065eb1054b279a98bdef06070428a068e180900 (diff) |
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
Diffstat (limited to 'main')
-rw-r--r-- | main/channel.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 6522837ed..d75e98306 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, |