diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2006-05-01 03:58:13 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2006-05-01 03:58:13 +0000 |
commit | dfdf6e1f76aa19e7974e9defdfc8fa9dc9494d8d (patch) | |
tree | 0234e5dc7654650af97c8d29439b8c512380306d | |
parent | 205d0aa4308edaaad6436edf58b52ef2b19596a7 (diff) |
Don't return stack pointers from functions (especially since the code will attempt to free() them later)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23854 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | channels/chan_misdn.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 1b307721a..ae05e57a7 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -930,7 +930,7 @@ static char *complete_ch_helper(const char *line, const char *word, int pos, int c = ast_channel_walk_locked(c); } if (c) { - ret = ast_strdupa(c->name); + ret = strdup(c->name); ast_mutex_unlock(&c->lock); } else ret = NULL; @@ -949,12 +949,12 @@ static char *complete_debug_port (const char *line, const char *word, int pos, i switch (pos) { case 4: if (*word == 'p') - return ast_strdupa("port"); + return strdup("port"); else if (*word == 'o') - return ast_strdupa("only"); + return strdup("only"); break; case 6: if (*word == 'o') - return ast_strdupa("only"); + return strdup("only"); break; } return NULL; @@ -1512,8 +1512,11 @@ static int read_config(struct chan_list *ch, int orig) { ast_set_callerid(ast, bc->oad, NULL, bc->oad); } - if ( !ast_strlen_zero(bc->rad) ) - ast->cid.cid_rdnis=ast_strdupa(bc->rad); + if ( !ast_strlen_zero(bc->rad) ) { + if (ast->cid.cid_rdnis) + free(ast->cid.cid_rdnis); + ast->cid.cid_rdnis = strdup(bc->rad); + } } return 0; } |