diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-07-31 20:21:43 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-07-31 20:21:43 +0000 |
| commit | 9b16c8b0f6c3b6310e303411421bfcb16b26c3c4 (patch) | |
| tree | 273c31a834a21bd2239ec6b83cd35c602ea25d26 /channels/chan_jingle.c | |
| parent | 6c23a60f802e7708389b1a6463a40dc0500512bd (diff) | |
Clean up and ensure proper usage of alloca()
This replaces all calls to alloca() with ast_alloca() which calls gcc's
__builtin_alloca() to avoid BSD semantics and removes all NULL checks
on memory allocated via ast_alloca() and ast_strdupa().
(closes issue ASTERISK-20125)
Review: https://reviewboard.asterisk.org/r/2032/
Patch-by: Walter Doekes (wdoekes)
........
Merged revisions 370642 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 370643 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@370655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_jingle.c')
| -rw-r--r-- | channels/chan_jingle.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 4f4af23fc..a3adb653a 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -1553,14 +1553,16 @@ static struct ast_channel *jingle_request(const char *type, struct ast_format_ca if (data) { s = ast_strdupa(data); - if (s) { - sender = strsep(&s, "/"); - if (sender && (sender[0] != '\0')) - to = strsep(&s, "/"); - if (!to) { - ast_log(LOG_ERROR, "Bad arguments in Jingle Dialstring: %s\n", data); - return NULL; - } + sender = strsep(&s, "/"); + if (sender && (sender[0] != '\0')) + to = strsep(&s, "/"); + if (!to) { + ast_log(LOG_ERROR, "Bad arguments in Jingle Dialstring: %s\n", data); + return NULL; + } + if (!to) { + ast_log(LOG_ERROR, "Bad arguments in Jingle Dialstring: %s\n", (char*) data); + return NULL; } } |