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 /res/res_agi.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 'res/res_agi.c')
| -rw-r--r-- | res/res_agi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index 328674c5a..6f7675f53 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -1571,10 +1571,11 @@ static enum agi_result launch_ha_netscript(char *agiurl, char *argv[], int *fds) unsigned short srvport; /* format of agiurl is "hagi://host.domain[:port][/script/name]" */ - if (!(host = ast_strdupa(agiurl + 7))) { /* Remove hagi:// */ + if (strlen(agiurl) < 7) { /* Remove hagi:// */ ast_log(LOG_WARNING, "An error occurred parsing the AGI URI: %s", agiurl); return AGI_RESULT_FAILURE; } + host = ast_strdupa(agiurl + 7); /* Strip off any script name */ if ((script = strchr(host, '/'))) { @@ -2500,7 +2501,7 @@ static int handle_exec(struct ast_channel *chan, AGI *agi, int argc, const char ast_set_flag(ast_channel_flags(chan), AST_FLAG_DISABLE_WORKAROUNDS); } if (ast_compat_res_agi && argc >= 3 && !ast_strlen_zero(argv[2])) { - char *compat = alloca(strlen(argv[2]) * 2 + 1), *cptr; + char *compat = ast_alloca(strlen(argv[2]) * 2 + 1), *cptr; const char *vptr; for (cptr = compat, vptr = argv[2]; *vptr; vptr++) { if (*vptr == ',') { |