diff options
Diffstat (limited to 'apps')
40 files changed, 366 insertions, 116 deletions
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c index 462506152..b7678a002 100644 --- a/apps/app_authenticate.c +++ b/apps/app_authenticate.c @@ -129,6 +129,11 @@ static int auth_exec(struct ast_channel *chan, void *data) } argcopy = ast_strdupa(data); + if (!argcopy) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(arglist,argcopy); diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 7d5c4adc3..5d49e1268 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -383,7 +383,10 @@ static int chanspy_exec(struct ast_channel *chan, void *data) struct ast_flags flags; signed char zero_volume = 0; - args = ast_strdupa(data); + if (!(args = ast_strdupa((char *)data))) { + ast_log(LOG_ERROR, "Out of memory!\n"); + return -1; + } LOCAL_USER_ADD(u); diff --git a/apps/app_curl.c b/apps/app_curl.c index 9842da4cd..93d77d571 100644 --- a/apps/app_curl.c +++ b/apps/app_curl.c @@ -129,6 +129,11 @@ static char *acf_curl_exec(struct ast_channel *chan, char *cmd, char *data, char LOCAL_USER_ACF_ADD(u); info = ast_strdupa(data); + if (!info) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return buf; + } AST_STANDARD_APP_ARGS(args, info); diff --git a/apps/app_db.c b/apps/app_db.c index 0161d4aa9..76a52cd1b 100644 --- a/apps/app_db.c +++ b/apps/app_db.c @@ -76,6 +76,11 @@ static int deltree_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); argv = ast_strdupa(data); + if (!argv) { + ast_log(LOG_ERROR, "Memory allocation failed\n"); + LOCAL_USER_REMOVE(u); + return 0; + } if (strchr(argv, '/')) { family = strsep(&argv, "/"); @@ -117,6 +122,11 @@ static int del_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); argv = ast_strdupa(data); + if (!argv) { + ast_log (LOG_ERROR, "Memory allocation failed\n"); + LOCAL_USER_REMOVE(u); + return 0; + } if (strchr(argv, '/')) { family = strsep(&argv, "/"); diff --git a/apps/app_dial.c b/apps/app_dial.c index 21e234294..3d45cf577 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -786,7 +786,11 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags LOCAL_USER_ADD(u); - parse = ast_strdupa(data); + if (!(parse = ast_strdupa(data))) { + ast_log(LOG_WARNING, "Memory allocation failure\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, parse); @@ -1624,6 +1628,11 @@ static int retrydial_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); announce = ast_strdupa(data); + if (!announce) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } memset(&peerflags, 0, sizeof(peerflags)); diff --git a/apps/app_dictate.c b/apps/app_dictate.c index 29f27d94e..3935c81ac 100644 --- a/apps/app_dictate.c +++ b/apps/app_dictate.c @@ -111,6 +111,10 @@ static int dictate_exec(struct ast_channel *chan, void *data) snprintf(dftbase, sizeof(dftbase), "%s/dictate", ast_config_AST_SPOOL_DIR); if (!ast_strlen_zero(data)) { parse = ast_strdupa(data); + if (!parse) { + ast_log(LOG_ERROR, "Out of memory!\n"); + return -1; + } AST_STANDARD_APP_ARGS(args, parse); } else args.argc = 0; diff --git a/apps/app_directory.c b/apps/app_directory.c index 4a4a6f59e..d506df1f1 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -433,6 +433,12 @@ static int directory_exec(struct ast_channel *chan, void *data) parse = ast_strdupa(data); + if (!parse) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } + AST_STANDARD_APP_ARGS(args, parse); if (args.options) { diff --git a/apps/app_disa.c b/apps/app_disa.c index 3c78b9b6a..3ba92e8a2 100644 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -162,6 +162,11 @@ static int disa_exec(struct ast_channel *chan, void *data) ast_log(LOG_DEBUG, "Responsetimeout: %d\n", firstdigittimeout); tmp = ast_strdupa(data); + if (!tmp) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, tmp); diff --git a/apps/app_exec.c b/apps/app_exec.c index b2a45dc93..9759455ac 100644 --- a/apps/app_exec.c +++ b/apps/app_exec.c @@ -73,22 +73,27 @@ static int exec_exec(struct ast_channel *chan, void *data) /* Check and parse arguments */ if (data) { - s = ast_strdupa(data); - appname = strsep(&s, "("); + s = ast_strdupa((char *)data); if (s) { - endargs = strrchr(s, ')'); - if (endargs) - *endargs = '\0'; - pbx_substitute_variables_helper(chan, s, args, MAXRESULT - 1); - } - if (appname) { - app = pbx_findapp(appname); - if (app) { - res = pbx_exec(chan, app, args, 1); - } else { - ast_log(LOG_WARNING, "Could not find application (%s)\n", appname); - res = -1; + appname = strsep(&s, "("); + if (s) { + endargs = strrchr(s, ')'); + if (endargs) + *endargs = '\0'; + pbx_substitute_variables_helper(chan, s, args, MAXRESULT - 1); + } + if (appname) { + app = pbx_findapp(appname); + if (app) { + res = pbx_exec(chan, app, args, 1); + } else { + ast_log(LOG_WARNING, "Could not find application (%s)\n", appname); + res = -1; + } } + } else { + ast_log(LOG_ERROR, "Out of memory\n"); + res = -1; } } diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c index bcf65d362..10232044d 100644 --- a/apps/app_externalivr.c +++ b/apps/app_externalivr.c @@ -272,6 +272,11 @@ static int app_exec(struct ast_channel *chan, void *data) } buf = ast_strdupa(data); + if (!buf) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } argc = ast_app_separate_args(buf, '|', argv, sizeof(argv) / sizeof(argv[0])); diff --git a/apps/app_festival.c b/apps/app_festival.c index 4ef0f0163..1921fdd11 100644 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -340,6 +340,12 @@ static int festival_exec(struct ast_channel *chan, void *vdata) } data = ast_strdupa(vdata); + if (!data) { + ast_log(LOG_ERROR, "Out of memery\n"); + ast_config_destroy(cfg); + LOCAL_USER_REMOVE(u); + return -1; + } intstr = strchr(data, '|'); if (intstr) { diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c index f4696fcbb..bb5535190 100644 --- a/apps/app_hasnewvoicemail.c +++ b/apps/app_hasnewvoicemail.c @@ -130,6 +130,11 @@ static int hasvoicemail_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); input = ast_strdupa((char *)data); + if (! input) { + ast_log(LOG_ERROR, "Out of memory error\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, input); @@ -189,6 +194,11 @@ static char *acf_vmcount_exec(struct ast_channel *chan, char *cmd, char *data, c buf[0] = '\0'; argsstr = ast_strdupa(data); + if (!argsstr) { + ast_log(LOG_ERROR, "Out of memory"); + LOCAL_USER_REMOVE(u); + return buf; + } AST_STANDARD_APP_ARGS(args, argsstr); diff --git a/apps/app_image.c b/apps/app_image.c index 689c19363..d33465aa9 100644 --- a/apps/app_image.c +++ b/apps/app_image.c @@ -78,7 +78,11 @@ static int sendimage_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); - parse = ast_strdupa(data); + if (!(parse = ast_strdupa(data))) { + ast_log(LOG_WARNING, "Memory Error!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, parse); diff --git a/apps/app_macro.c b/apps/app_macro.c index a33e9f2ed..63cf46474 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -308,6 +308,11 @@ static int macroif_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); expr = ast_strdupa(data); + if (!expr) { + ast_log(LOG_ERROR, "Out of Memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } if ((label_a = strchr(expr, '?'))) { *label_a = '\0'; diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 3ce629874..c3068ce3c 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1779,6 +1779,10 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno, continue; parse = ast_strdupa(var->value); + if (!parse) { + ast_log(LOG_ERROR, "Out of Memory!\n"); + return NULL; + } AST_STANDARD_APP_ARGS(args, parse); if (!strcasecmp(args.confno, confno)) { @@ -1835,6 +1839,11 @@ static int count_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); localdata = ast_strdupa(data); + if (!localdata) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, localdata); diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index 0b1f68e67..279f0e646 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -333,7 +333,11 @@ static int mixmonitor_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); - parse = ast_strdupa(data); + if (!(parse = ast_strdupa(data))) { + ast_log(LOG_WARNING, "Memory Error!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, parse); diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index 18091e5c5..af9bf9877 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -139,6 +139,11 @@ static int osplookup_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); temp = ast_strdupa(data); + if (!temp) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, temp); @@ -197,6 +202,11 @@ static int ospnext_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); temp = ast_strdupa(data); + if (!temp) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, temp); @@ -266,6 +276,11 @@ static int ospfinished_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); temp = ast_strdupa(data); + if (!temp) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, temp); diff --git a/apps/app_page.c b/apps/app_page.c index b4eb1a55b..4dd9f2015 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -164,6 +164,11 @@ static int page_exec(struct ast_channel *chan, void *data) }; options = ast_strdupa(data); + if (!options) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } tmp = strsep(&options, "|"); if (options) diff --git a/apps/app_playback.c b/apps/app_playback.c index 7df06d91b..653d95467 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -90,6 +90,10 @@ static int playback_exec(struct ast_channel *chan, void *data) } tmp = ast_strdupa(data); + if (!tmp) { + ast_log(LOG_ERROR, "Out of memory!\n"); + return -1; + } LOCAL_USER_ADD(u); AST_STANDARD_APP_ARGS(args, tmp); diff --git a/apps/app_privacy.c b/apps/app_privacy.c index 3a0561b62..a3d26af33 100644 --- a/apps/app_privacy.c +++ b/apps/app_privacy.c @@ -118,6 +118,11 @@ static int privacy_exec (struct ast_channel *chan, void *data) if (!ast_strlen_zero((char *)data)) { parse = ast_strdupa(data); + if (!parse) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, parse); diff --git a/apps/app_queue.c b/apps/app_queue.c index e0acccce3..22c884ca0 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2645,7 +2645,11 @@ static int pqm_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); - parse = ast_strdupa(data); + if (!(parse = ast_strdupa(data))) { + ast_log(LOG_WARNING, "Memory Error!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, parse); @@ -2697,7 +2701,11 @@ static int upqm_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); - parse = ast_strdupa(data); + if (!(parse = ast_strdupa(data))) { + ast_log(LOG_WARNING, "Memory Error!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, parse); @@ -2751,7 +2759,11 @@ static int rqm_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); - parse = ast_strdupa(data); + if (!(parse = ast_strdupa(data))) { + ast_log(LOG_WARNING, "Memory Error!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, parse); @@ -2815,11 +2827,7 @@ static int aqm_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); - if (!(parse = ast_strdupa(data))) { - ast_log(LOG_WARNING, "Memory Error!\n"); - LOCAL_USER_REMOVE(u); - return -1; - } + parse = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, parse); diff --git a/apps/app_random.c b/apps/app_random.c index 2ebd437a2..f7d09e87a 100644 --- a/apps/app_random.c +++ b/apps/app_random.c @@ -74,6 +74,11 @@ static int random_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); s = ast_strdupa(data); + if (!s) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } prob = strsep(&s,":"); if ((!prob) || (sscanf(prob, "%d", &probint) != 1)) diff --git a/apps/app_read.c b/apps/app_read.c index eaa9cfdd2..ef7f183ad 100644 --- a/apps/app_read.c +++ b/apps/app_read.c @@ -118,6 +118,11 @@ static int read_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); argcopy = ast_strdupa(data); + if (!argcopy) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(arglist, argcopy); diff --git a/apps/app_readfile.c b/apps/app_readfile.c index 33935486b..528fe8237 100644 --- a/apps/app_readfile.c +++ b/apps/app_readfile.c @@ -74,6 +74,11 @@ static int readfile_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); s = ast_strdupa(data); + if (!s) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } varname = strsep(&s, "="); file = strsep(&s, "|"); diff --git a/apps/app_realtime.c b/apps/app_realtime.c index a88620ea6..9e83d2638 100644 --- a/apps/app_realtime.c +++ b/apps/app_realtime.c @@ -148,19 +148,20 @@ static int realtime_update_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); - family = ast_strdupa(data); - if ((colmatch = strchr(family,'|'))) { - crop_data(colmatch); - if ((value = strchr(colmatch,'|'))) { - crop_data(value); - if ((newcol = strchr(value,'|'))) { - crop_data(newcol); - if ((newval = strchr(newcol,'|'))) - crop_data(newval); + if ((family = ast_strdupa(data))) { + if ((colmatch = strchr(family,'|'))) { + crop_data(colmatch); + if ((value = strchr(colmatch,'|'))) { + crop_data(value); + if ((newcol = strchr(value,'|'))) { + crop_data(newcol); + if ((newval = strchr(newcol,'|'))) + crop_data(newval); + } } } } - if (!newval) { + if (! (family && value && colmatch && newcol && newval) ) { ast_log(LOG_ERROR,"Invalid input: usage %s\n",UUSAGE); res = -1; } else { @@ -192,16 +193,17 @@ static int realtime_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); - family = ast_strdupa(data); - if ((colmatch = strchr(family,'|'))) { - crop_data(colmatch); - if ((value = strchr(colmatch,'|'))) { - crop_data(value); - if ((prefix = strchr(value,'|'))) - crop_data(prefix); + if ((family = ast_strdupa(data))) { + if ((colmatch = strchr(family,'|'))) { + crop_data(colmatch); + if ((value = strchr(colmatch,'|'))) { + crop_data(value); + if ((prefix = strchr(value,'|'))) + crop_data(prefix); + } } } - if (!value) { + if (! (family && value && colmatch) ) { ast_log(LOG_ERROR,"Invalid input: usage %s\n",USAGE); res = -1; } else { diff --git a/apps/app_record.c b/apps/app_record.c index c4f28fcab..f5be5528d 100644 --- a/apps/app_record.c +++ b/apps/app_record.c @@ -117,6 +117,11 @@ static int record_exec(struct ast_channel *chan, void *data) /* Yay for strsep being easy */ vdata = ast_strdupa(data); + if (!vdata) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } p = vdata; filename = strsep(&p, "|"); diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c index 4739d9796..cde4e65c9 100644 --- a/apps/app_sayunixtime.c +++ b/apps/app_sayunixtime.c @@ -92,21 +92,26 @@ static int sayunixtime_exec(struct ast_channel *chan, void *data) } if (data) { - s = ast_strdupa(data); - timec = strsep(&s,"|"); - if ((timec) && (*timec != '\0')) { - long timein; - if (sscanf(timec,"%ld",&timein) == 1) { - unixtime = (time_t)timein; - } - } + s = data; + s = ast_strdupa(s); if (s) { - zone = strsep(&s,"|"); - if (zone && (*zone == '\0')) - zone = NULL; + timec = strsep(&s,"|"); + if ((timec) && (*timec != '\0')) { + long timein; + if (sscanf(timec,"%ld",&timein) == 1) { + unixtime = (time_t)timein; + } + } if (s) { - format = s; + zone = strsep(&s,"|"); + if (zone && (*zone == '\0')) + zone = NULL; + if (s) { + format = s; + } } + } else { + ast_log(LOG_ERROR, "Out of memory error\n"); } } diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c index fe1af90f6..e4eb33ecf 100644 --- a/apps/app_senddtmf.c +++ b/apps/app_senddtmf.c @@ -75,6 +75,11 @@ static int senddtmf_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); digits = ast_strdupa(data); + if (!digits) { + ast_log(LOG_ERROR, "Out of Memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } if ((to = strchr(digits,'|'))) { *to = '\0'; diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c index 4f39fa4dd..4ddbc1c65 100644 --- a/apps/app_sendtext.c +++ b/apps/app_sendtext.c @@ -87,8 +87,14 @@ static int sendtext_exec(struct ast_channel *chan, void *data) ast_log(LOG_WARNING, "SendText requires an argument (text[|options])\n"); LOCAL_USER_REMOVE(u); return -1; - } else + } else { parse = ast_strdupa(data); + if (!parse) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } + } AST_STANDARD_APP_ARGS(args, parse); diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c index 5e857c4ab..7c643b281 100644 --- a/apps/app_setcallerid.c +++ b/apps/app_setcallerid.c @@ -118,6 +118,11 @@ static int setcallerid_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); tmp = ast_strdupa(data); + if (!tmp) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } opt = strchr(tmp, '|'); if (opt) { diff --git a/apps/app_skel.c b/apps/app_skel.c index ba2999a1c..b29f3162a 100644 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -88,6 +88,11 @@ static int app_exec(struct ast_channel *chan, void *data) /* We need to make a copy of the input string if we are going to modify it! */ args = ast_strdupa(data); + if (!args) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } if ((argc = ast_app_separate_args(args, '|', argv, sizeof(argv) / sizeof(argv[0])))) { dummy = argv[0]; diff --git a/apps/app_stack.c b/apps/app_stack.c index 8323f0b23..db2eafa85 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -130,6 +130,10 @@ static int gosubif_exec(struct ast_channel *chan, void *data) } args = ast_strdupa((char *)data); + if (!args) { + ast_log(LOG_ERROR, "Out of memory\n"); + return -1; + } LOCAL_USER_ADD(u); diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c index 89a69e784..2223e85b6 100644 --- a/apps/app_talkdetect.c +++ b/apps/app_talkdetect.c @@ -89,6 +89,11 @@ static int background_detect_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); tmp = ast_strdupa(data); + if (!tmp) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } stringp=tmp; strsep(&stringp, "|"); diff --git a/apps/app_transfer.c b/apps/app_transfer.c index c97d97dcd..98790341e 100644 --- a/apps/app_transfer.c +++ b/apps/app_transfer.c @@ -88,14 +88,19 @@ static int transfer_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); - if (ast_strlen_zero(data)) { + if (ast_strlen_zero((char *)data)) { ast_log(LOG_WARNING, "Transfer requires an argument ([Tech/]destination[|options])\n"); LOCAL_USER_REMOVE(u); pbx_builtin_setvar_helper(chan, "TRANSFERSTATUS", "FAILURE"); return 0; + } else { + parse = ast_strdupa(data); + if (!parse) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } } - - parse = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, parse); diff --git a/apps/app_url.c b/apps/app_url.c index 10bd1fad2..7791b4e54 100644 --- a/apps/app_url.c +++ b/apps/app_url.c @@ -94,8 +94,14 @@ static int sendurl_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); - stringp = tmp = ast_strdupa(data); + tmp = ast_strdupa(data); + if (!tmp) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } + stringp=tmp; strsep(&stringp, "|"); options = strsep(&stringp, "|"); if (options && !strcasecmp(options, "wait")) diff --git a/apps/app_userevent.c b/apps/app_userevent.c index 850627fad..95f5fbc84 100644 --- a/apps/app_userevent.c +++ b/apps/app_userevent.c @@ -75,6 +75,11 @@ static int userevent_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); info = ast_strdupa(data); + if (!info) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } snprintf(eventname, sizeof(eventname), "UserEvent%s", info); eventbody = strchr(eventname, '|'); diff --git a/apps/app_verbose.c b/apps/app_verbose.c index 4b7a54b0e..4ec4839d7 100644 --- a/apps/app_verbose.c +++ b/apps/app_verbose.c @@ -67,34 +67,38 @@ static int verbose_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); if (data) { - vtext = ast_strdupa(data); - char *tmp = strsep(&vtext, "|,"); + vtext = ast_strdupa((char *)data); if (vtext) { - if (sscanf(tmp, "%d", &vsize) != 1) { + char *tmp = strsep(&vtext, "|,"); + if (vtext) { + if (sscanf(tmp, "%d", &vsize) != 1) { + vsize = 0; + ast_log(LOG_WARNING, "'%s' is not a verboser number\n", vtext); + } + } else { + vtext = tmp; vsize = 0; - ast_log(LOG_WARNING, "'%s' is not a verboser number\n", vtext); } - } else { - vtext = tmp; - vsize = 0; - } - if (option_verbose >= vsize) { - switch (vsize) { - case 0: - ast_verbose("%s\n", vtext); - break; - case 1: - ast_verbose(VERBOSE_PREFIX_1 "%s\n", vtext); - break; - case 2: - ast_verbose(VERBOSE_PREFIX_2 "%s\n", vtext); - break; - case 3: - ast_verbose(VERBOSE_PREFIX_3 "%s\n", vtext); - break; - default: - ast_verbose(VERBOSE_PREFIX_4 "%s\n", vtext); + if (option_verbose >= vsize) { + switch (vsize) { + case 0: + ast_verbose("%s\n", vtext); + break; + case 1: + ast_verbose(VERBOSE_PREFIX_1 "%s\n", vtext); + break; + case 2: + ast_verbose(VERBOSE_PREFIX_2 "%s\n", vtext); + break; + case 3: + ast_verbose(VERBOSE_PREFIX_3 "%s\n", vtext); + break; + default: + ast_verbose(VERBOSE_PREFIX_4 "%s\n", vtext); + } } + } else { + ast_log(LOG_ERROR, "Out of memory\n"); } } @@ -117,6 +121,11 @@ static int log_exec(struct ast_channel *chan, void *data) } ltext = ast_strdupa(data); + if (!ltext) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return 0; + } level = strsep(<ext, "|"); diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index bf6e93a8f..e46735d03 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -3284,23 +3284,28 @@ static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu, snprintf(ext_context, sizeof(ext_context), "%s@%s", vmu->mailbox, vmu->context); /* Attach only the first format */ - stringp = fmt = ast_strdupa(fmt); - strsep(&stringp, "|"); - - if (!ast_strlen_zero(vmu->email)) { - int attach_user_voicemail = ast_test_flag((&globalflags), VM_ATTACH); - char *myserveremail = serveremail; - attach_user_voicemail = ast_test_flag(vmu, VM_ATTACH); - if (!ast_strlen_zero(vmu->serveremail)) - myserveremail = vmu->serveremail; - sendmail(myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, cidnum, cidname, fn, fmt, duration, attach_user_voicemail, category); - } - - if (!ast_strlen_zero(vmu->pager)) { - char *myserveremail = serveremail; - if (!ast_strlen_zero(vmu->serveremail)) - myserveremail = vmu->serveremail; - sendpage(myserveremail, vmu->pager, msgnum, vmu->context, vmu->mailbox, cidnum, cidname, duration, vmu, category); + fmt = ast_strdupa(fmt); + if (fmt) { + stringp = fmt; + strsep(&stringp, "|"); + + if (!ast_strlen_zero(vmu->email)) { + int attach_user_voicemail = ast_test_flag((&globalflags), VM_ATTACH); + char *myserveremail = serveremail; + attach_user_voicemail = ast_test_flag(vmu, VM_ATTACH); + if (!ast_strlen_zero(vmu->serveremail)) + myserveremail = vmu->serveremail; + sendmail(myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, cidnum, cidname, fn, fmt, duration, attach_user_voicemail, category); + } + + if (!ast_strlen_zero(vmu->pager)) { + char *myserveremail = serveremail; + if (!ast_strlen_zero(vmu->serveremail)) + myserveremail = vmu->serveremail; + sendpage(myserveremail, vmu->pager, msgnum, vmu->context, vmu->mailbox, cidnum, cidname, duration, vmu, category); + } + } else { + ast_log(LOG_ERROR, "Out of memory\n"); } if (ast_test_flag(vmu, VM_DELETE)) { @@ -5053,6 +5058,11 @@ static int vm_execmain(struct ast_channel *chan, void *data) ); parse = ast_strdupa(data); + if (!parse) { + ast_log(LOG_ERROR, "Out of memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, parse); @@ -5638,6 +5648,11 @@ static int vm_box_exists(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); box = ast_strdupa(data); + if (!box) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } AST_STANDARD_APP_ARGS(args, box); @@ -5675,6 +5690,10 @@ static int vmauthenticate(struct ast_channel *chan, void *data) if (s) { s = ast_strdupa(s); + if (!s) { + ast_log(LOG_ERROR, "Out of memory\n"); + return -1; + } user = strsep(&s, "|"); options = strsep(&s, "|"); if (user) { @@ -6121,22 +6140,28 @@ static int load_config(void) if ((z = ast_malloc(sizeof(*z)))) { char *msg_format, *timezone; msg_format = ast_strdupa(var->value); - timezone = strsep(&msg_format, "|"); - if (msg_format) { - ast_copy_string(z->name, var->name, sizeof(z->name)); - ast_copy_string(z->timezone, timezone, sizeof(z->timezone)); - ast_copy_string(z->msg_format, msg_format, sizeof(z->msg_format)); - z->next = NULL; - if (zones) { - zonesl->next = z; - zonesl = z; + if (msg_format != NULL) { + timezone = strsep(&msg_format, "|"); + if (msg_format) { + ast_copy_string(z->name, var->name, sizeof(z->name)); + ast_copy_string(z->timezone, timezone, sizeof(z->timezone)); + ast_copy_string(z->msg_format, msg_format, sizeof(z->msg_format)); + z->next = NULL; + if (zones) { + zonesl->next = z; + zonesl = z; + } else { + zones = z; + zonesl = z; + } } else { - zones = z; - zonesl = z; + ast_log(LOG_WARNING, "Invalid timezone definition at line %d\n", var->lineno); + free(z); } } else { - ast_log(LOG_WARNING, "Invalid timezone definition at line %d\n", var->lineno); + ast_log(LOG_WARNING, "Out of memory while reading voicemail config\n"); free(z); + return -1; } } else { return -1; diff --git a/apps/app_while.c b/apps/app_while.c index df2fb97e6..1ebd8f2b3 100644 --- a/apps/app_while.c +++ b/apps/app_while.c @@ -90,6 +90,11 @@ static int execif_exec(struct ast_channel *chan, void *data) { LOCAL_USER_ADD(u); expr = ast_strdupa(data); + if (!expr) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } if ((myapp = strchr(expr,'|'))) { *myapp = '\0'; @@ -239,8 +244,9 @@ static int _while_exec(struct ast_channel *chan, void *data, int end) snprintf(used_index, VAR_SIZE, "%d", used_index_i); snprintf(new_index, VAR_SIZE, "%d", used_index_i + 1); - if (!end) - condition = ast_strdupa(data); + if (!end) { + condition = ast_strdupa((char *) data); + } size = strlen(chan->context) + strlen(chan->exten) + 32; my_name = alloca(size); diff --git a/apps/app_zapras.c b/apps/app_zapras.c index 9b69c391f..94285cb45 100644 --- a/apps/app_zapras.c +++ b/apps/app_zapras.c @@ -210,6 +210,11 @@ static int zapras_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); args = ast_strdupa(data); + if (!args) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } /* Answer the channel if it's not up */ if (chan->_state != AST_STATE_UP) |