kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't let ast_channel_alloc fail if explicitly passed NULL cid_name or cid_number.

Browse Source 
This also fixes a small memory leak.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@187680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2009-04-10 16:06:22 +00:00
parent 32cd7d1d60
commit bdcf8fca81
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
main/channel.c
View File

@@ -796,11 +796,22 @@ struct ast_channel *ast_channel_alloc(int needqueue, int state, const char *cid_
return NULL;
}
if (!(tmp->cid.cid_name = ast_strdup(cid_name)) || !(tmp->cid.cid_num = ast_strdup(cid_num))) {
ast_string_field_free_memory(tmp);
sched_context_destroy(tmp->sched);
ast_free(tmp);
return NULL;
if (cid_name) {
if (!(tmp->cid.cid_name = ast_strdup(cid_name))) {
ast_string_field_free_memory(tmp);
sched_context_destroy(tmp->sched);
ast_free(tmp);
return NULL;
}
}
if (cid_num) {
if (!(tmp->cid.cid_num = ast_strdup(cid_num))) {
ast_string_field_free_memory(tmp);
sched_context_destroy(tmp->sched);
ast_free(tmp->cid.cid_name);
ast_free(tmp);
return NULL;
}
}
#ifdef HAVE_EPOLL