diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_adsiprog.c | 6 | ||||
-rw-r--r-- | apps/app_alarmreceiver.c | 2 | ||||
-rw-r--r-- | apps/app_chanspy.c | 2 | ||||
-rw-r--r-- | apps/app_cut.c | 10 | ||||
-rw-r--r-- | apps/app_dial.c | 4 | ||||
-rw-r--r-- | apps/app_disa.c | 4 | ||||
-rw-r--r-- | apps/app_groupcount.c | 2 | ||||
-rw-r--r-- | apps/app_macro.c | 8 | ||||
-rw-r--r-- | apps/app_math.c | 4 | ||||
-rw-r--r-- | apps/app_meetme.c | 12 | ||||
-rw-r--r-- | apps/app_mixmonitor.c | 6 | ||||
-rw-r--r-- | apps/app_osplookup.c | 6 | ||||
-rw-r--r-- | apps/app_privacy.c | 8 | ||||
-rw-r--r-- | apps/app_queue.c | 8 | ||||
-rw-r--r-- | apps/app_random.c | 2 | ||||
-rw-r--r-- | apps/app_readfile.c | 2 | ||||
-rw-r--r-- | apps/app_record.c | 4 | ||||
-rw-r--r-- | apps/app_sayunixtime.c | 2 | ||||
-rw-r--r-- | apps/app_sms.c | 2 | ||||
-rw-r--r-- | apps/app_talkdetect.c | 6 | ||||
-rw-r--r-- | apps/app_verbose.c | 2 | ||||
-rw-r--r-- | apps/app_voicemail.c | 24 | ||||
-rw-r--r-- | apps/app_waitforring.c | 2 | ||||
-rw-r--r-- | apps/app_waitforsilence.c | 4 | ||||
-rw-r--r-- | apps/app_zapbarge.c | 6 |
25 files changed, 69 insertions, 69 deletions
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index 79fe30122..98398f06c 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -194,7 +194,7 @@ static int process_token(void *out, char *src, int maxlen, int argtype) if (!(argtype & ARG_NUMBER)) return -1; /* Octal value */ - if (sscanf(src, "%o", (int *)out) != 1) + if (sscanf(src, "%30o", (int *)out) != 1) return -1; if (argtype & ARG_STRING) { /* Convert */ @@ -204,7 +204,7 @@ static int process_token(void *out, char *src, int maxlen, int argtype) if (!(argtype & ARG_NUMBER)) return -1; /* Hex value */ - if (sscanf(src + 2, "%x", (unsigned int *)out) != 1) + if (sscanf(src + 2, "%30x", (unsigned int *)out) != 1) return -1; if (argtype & ARG_STRING) { /* Convert */ @@ -214,7 +214,7 @@ static int process_token(void *out, char *src, int maxlen, int argtype) if (!(argtype & ARG_NUMBER)) return -1; /* Hex value */ - if (sscanf(src, "%d", (int *)out) != 1) + if (sscanf(src, "%30d", (int *)out) != 1) return -1; if (argtype & ARG_STRING) { /* Convert */ diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c index 6ef78f5eb..3c3812152 100644 --- a/apps/app_alarmreceiver.c +++ b/apps/app_alarmreceiver.c @@ -134,7 +134,7 @@ static void database_increment( char *key ) return; } - sscanf(value, "%u", &v); + sscanf(value, "%30u", &v); v++; if(option_verbose >= 4) diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 0d594996f..c70b113a9 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -426,7 +426,7 @@ static int chanspy_exec(struct ast_channel *chan, void *data) if (ast_test_flag(&flags, OPTION_VOLUME) && opts[OPT_ARG_VOLUME]) { int vol; - if ((sscanf(opts[OPT_ARG_VOLUME], "%d", &vol) != 1) || (vol > 4) || (vol < -4)) + if ((sscanf(opts[OPT_ARG_VOLUME], "%30d", &vol) != 1) || (vol > 4) || (vol < -4)) ast_log(LOG_NOTICE, "Volume factor must be a number between -4 and 4\n"); else volfactor = vol; diff --git a/apps/app_cut.c b/apps/app_cut.c index a97405775..b1545d90f 100644 --- a/apps/app_cut.c +++ b/apps/app_cut.c @@ -134,7 +134,7 @@ static int sort_internal(struct ast_channel *chan, char *data, char *buffer, siz *ptrvalue = '\0'; ptrvalue++; sortable_keys[count2].key = ptrkey; - sscanf(ptrvalue, "%f", &sortable_keys[count2].value); + sscanf(ptrvalue, "%30f", &sortable_keys[count2].value); count2++; } @@ -206,15 +206,15 @@ static int cut_internal(struct ast_channel *chan, char *data, char *buffer, size int num1 = 0, num2 = MAXRESULT; char trashchar; - if (sscanf(nextgroup, "%d-%d", &num1, &num2) == 2) { + if (sscanf(nextgroup, "%30d-%30d", &num1, &num2) == 2) { /* range with both start and end */ - } else if (sscanf(nextgroup, "-%d", &num2) == 1) { + } else if (sscanf(nextgroup, "-%30d", &num2) == 1) { /* range with end */ num1 = 0; - } else if ((sscanf(nextgroup, "%d%c", &num1, &trashchar) == 2) && (trashchar == '-')) { + } else if ((sscanf(nextgroup, "%30d%1c", &num1, &trashchar) == 2) && (trashchar == '-')) { /* range with start */ num2 = MAXRESULT; - } else if (sscanf(nextgroup, "%d", &num1) == 1) { + } else if (sscanf(nextgroup, "%30d", &num1) == 1) { /* single number */ num2 = num1; } else { diff --git a/apps/app_dial.c b/apps/app_dial.c index 834b7dc47..6b78720e9 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1706,7 +1706,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data) if ((dialdata = strchr(announce, '|'))) { *dialdata = '\0'; dialdata++; - if (sscanf(dialdata, "%d", &sleep) == 1) { + if (sscanf(dialdata, "%30d", &sleep) == 1) { sleep *= 1000; } else { ast_log(LOG_ERROR, "%s requires the numerical argument <sleep>\n",rapp); @@ -1716,7 +1716,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data) if ((dialdata = strchr(dialdata, '|'))) { *dialdata = '\0'; dialdata++; - if (sscanf(dialdata, "%d", &loops) != 1) { + if (sscanf(dialdata, "%30d", &loops) != 1) { ast_log(LOG_ERROR, "%s requires the numerical argument <loops>\n",rapp); LOCAL_USER_REMOVE(u); return -1; diff --git a/apps/app_disa.c b/apps/app_disa.c index 2ac124525..159129100 100644 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -249,7 +249,7 @@ static int disa_exec(struct ast_channel *chan, void *data) if (j == '#') /* end of password */ { /* see if this is an integer */ - if (sscanf(args.passcode,"%d",&j) < 1) + if (sscanf(args.passcode,"%30d",&j) < 1) { /* nope, it must be a filename */ fp = fopen(args.passcode,"r"); if (!fp) @@ -274,7 +274,7 @@ static int disa_exec(struct ast_channel *chan, void *data) ast_log(LOG_DEBUG, "Mailbox: %s\n",args.mailbox); /* password must be in valid format (numeric) */ - if (sscanf(args.passcode,"%d",&j) < 1) continue; + if (sscanf(args.passcode,"%30d",&j) < 1) continue; /* if we got it */ if (!strcmp(exten,args.passcode)) { if (ast_strlen_zero(args.context)) diff --git a/apps/app_groupcount.c b/apps/app_groupcount.c index 496f62b8f..b340d823c 100644 --- a/apps/app_groupcount.c +++ b/apps/app_groupcount.c @@ -180,7 +180,7 @@ static int group_check_exec(struct ast_channel *chan, void *data) ast_app_group_split_group(args.max, limit, sizeof(limit), category, sizeof(category)); - if ((sscanf(limit, "%d", &max) == 1) && (max > -1)) { + if ((sscanf(limit, "%30d", &max) == 1) && (max > -1)) { count = ast_app_group_get_count(pbx_builtin_getvar_helper(chan, category), category); if (count > max) { pbx_builtin_setvar_helper(chan, "CHECKGROUPSTATUS", "OVERMAX"); diff --git a/apps/app_macro.c b/apps/app_macro.c index 557155c71..249b56a02 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -169,12 +169,12 @@ static int macro_exec(struct ast_channel *chan, void *data) /* does the user want a deeper rabbit hole? */ s = pbx_builtin_getvar_helper(chan, "MACRO_RECURSION"); if (s) - sscanf(s, "%d", &maxdepth); + sscanf(s, "%3d", &maxdepth); /* Count how many levels deep the rabbit hole goes */ tmp = pbx_builtin_getvar_helper(chan, "MACRO_DEPTH"); if (tmp) { - sscanf(tmp, "%d", &depth); + sscanf(tmp, "%3d", &depth); } else { depth = 0; } @@ -184,7 +184,7 @@ static int macro_exec(struct ast_channel *chan, void *data) pbx_builtin_setvar_helper(chan, "MACRO_IN_HANGUP", "1"); inhangupc = pbx_builtin_getvar_helper(chan, "MACRO_IN_HANGUP"); if (!ast_strlen_zero(inhangupc)) - sscanf(inhangupc, "%d", &inhangup); + sscanf(inhangupc, "%3d", &inhangup); if (depth >= maxdepth) { ast_log(LOG_ERROR, "Macro(): possible infinite loop detected. Returning early.\n"); @@ -442,7 +442,7 @@ static int macro_exec(struct ast_channel *chan, void *data) if ((offsets = pbx_builtin_getvar_helper(chan, "MACRO_OFFSET"))) { /* Handle macro offset if it's set by checking the availability of step n + offset + 1, otherwise continue normally if there is any problem */ - if (sscanf(offsets, "%d", &offset) == 1) { + if (sscanf(offsets, "%30d", &offset) == 1) { if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + offset + 1, chan->cid.cid_num)) { chan->priority += offset; } diff --git a/apps/app_math.c b/apps/app_math.c index f52385c02..adccf85bb 100644 --- a/apps/app_math.c +++ b/apps/app_math.c @@ -181,13 +181,13 @@ static int math_exec(struct ast_channel *chan, void *data) return -1; } - if (sscanf(mvalue1, "%f", &fnum1) != 1) { + if (sscanf(mvalue1, "%30f", &fnum1) != 1) { ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue1); LOCAL_USER_REMOVE(u); return -1; } - if (sscanf(mvalue2, "%f", &fnum2) != 1) { + if (sscanf(mvalue2, "%30f", &fnum2) != 1) { ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue2); LOCAL_USER_REMOVE(u); return -1; diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 405dff9aa..005a6c6da 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -497,7 +497,7 @@ static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin ast_verbose(VERBOSE_PREFIX_3 "Created MeetMe conference %d for conference '%s'\n", cnf->zapconf, cnf->confno); AST_LIST_INSERT_HEAD(&confs, cnf, list); /* Reserve conference number in map */ - if ((sscanf(cnf->confno, "%d", &confno_int) == 1) && (confno_int >= 0 && confno_int < 1024)) + if ((sscanf(cnf->confno, "%30d", &confno_int) == 1) && (confno_int >= 0 && confno_int < 1024)) conf_map[confno_int] = 1; } else ast_log(LOG_WARNING, "Out of memory\n"); @@ -806,7 +806,7 @@ static int dispose_conf(struct ast_conference *conf) AST_LIST_LOCK(&confs); if (ast_atomic_dec_and_test(&conf->refcount)) { /* Take the conference room number out of an inuse state */ - if ((sscanf(conf->confno, "%d", &confno_int) == 1) && (confno_int >= 0 && confno_int < 1024)) + if ((sscanf(conf->confno, "%30d", &confno_int) == 1) && (confno_int >= 0 && confno_int < 1024)) conf_map[confno_int] = 0; conf_free(conf); res = 1; @@ -862,7 +862,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c /* Possible timeout waiting for marked user */ if ((confflags & CONFFLAG_WAITMARKED) && !ast_strlen_zero(optargs[OPT_ARG_WAITMARKED]) && - (sscanf(optargs[OPT_ARG_WAITMARKED], "%d", &opt_waitmarked_timeout) == 1) && + (sscanf(optargs[OPT_ARG_WAITMARKED], "%30d", &opt_waitmarked_timeout) == 1) && (opt_waitmarked_timeout > 0)) { timeout = time(NULL) + opt_waitmarked_timeout; } @@ -1901,7 +1901,7 @@ static int conf_exec(struct ast_channel *chan, void *data) if (!res) ast_waitstream(chan, ""); } else { - if (sscanf(confno, "%d", &confno_int) == 1) { + if (sscanf(confno, "%30d", &confno_int) == 1) { res = ast_streamfile(chan, "conf-enteringno", chan->language); if (!res) { ast_waitstream(chan, ""); @@ -2020,7 +2020,7 @@ static struct ast_conf_user* find_user(struct ast_conference *conf, char *caller return NULL; } - sscanf(callerident, "%i", &cid); + sscanf(callerident, "%30i", &cid); AST_LIST_TRAVERSE(&conf->userlist, user, list) { if (user->user_no == cid) @@ -2179,7 +2179,7 @@ static void load_config(void) return; if ((val = ast_variable_retrieve(cfg, "general", "audiobuffers"))) { - if ((sscanf(val, "%d", &audio_buffers) != 1)) { + if ((sscanf(val, "%30d", &audio_buffers) != 1)) { ast_log(LOG_WARNING, "audiobuffers setting must be a number, not '%s'\n", val); audio_buffers = DEFAULT_AUDIO_BUFFERS; } else if ((audio_buffers < ZT_DEFAULT_NUM_BUFS) || (audio_buffers > ZT_MAX_NUM_BUFS)) { diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index 9f3e2e32e..d487cfe25 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -336,7 +336,7 @@ static int mixmonitor_exec(struct ast_channel *chan, void *data) if (ast_test_flag(&flags, MUXFLAG_READVOLUME)) { if (ast_strlen_zero(opts[OPT_ARG_READVOLUME])) { ast_log(LOG_WARNING, "No volume level was provided for the heard volume ('v') option.\n"); - } else if ((sscanf(opts[OPT_ARG_READVOLUME], "%d", &x) != 1) || (x < -4) || (x > 4)) { + } else if ((sscanf(opts[OPT_ARG_READVOLUME], "%2d", &x) != 1) || (x < -4) || (x > 4)) { ast_log(LOG_NOTICE, "Heard volume must be a number between -4 and 4, not '%s'\n", opts[OPT_ARG_READVOLUME]); } else { readvol = get_volfactor(x); @@ -346,7 +346,7 @@ static int mixmonitor_exec(struct ast_channel *chan, void *data) if (ast_test_flag(&flags, MUXFLAG_WRITEVOLUME)) { if (ast_strlen_zero(opts[OPT_ARG_WRITEVOLUME])) { ast_log(LOG_WARNING, "No volume level was provided for the spoken volume ('V') option.\n"); - } else if ((sscanf(opts[OPT_ARG_WRITEVOLUME], "%d", &x) != 1) || (x < -4) || (x > 4)) { + } else if ((sscanf(opts[OPT_ARG_WRITEVOLUME], "%2d", &x) != 1) || (x < -4) || (x > 4)) { ast_log(LOG_NOTICE, "Spoken volume must be a number between -4 and 4, not '%s'\n", opts[OPT_ARG_WRITEVOLUME]); } else { writevol = get_volfactor(x); @@ -356,7 +356,7 @@ static int mixmonitor_exec(struct ast_channel *chan, void *data) if (ast_test_flag(&flags, MUXFLAG_VOLUME)) { if (ast_strlen_zero(opts[OPT_ARG_VOLUME])) { ast_log(LOG_WARNING, "No volume level was provided for the combined volume ('W') option.\n"); - } else if ((sscanf(opts[OPT_ARG_VOLUME], "%d", &x) != 1) || (x < -4) || (x > 4)) { + } else if ((sscanf(opts[OPT_ARG_VOLUME], "%2d", &x) != 1) || (x < -4) || (x > 4)) { ast_log(LOG_NOTICE, "Combined volume must be a number between -4 and 4, not '%s'\n", opts[OPT_ARG_VOLUME]); } else { readvol = writevol = get_volfactor(x); diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index f436d7cfa..5b45141b3 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -216,11 +216,11 @@ static int ospnext_exec(struct ast_channel *chan, void *data) cause = str2cause(args.cause); temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE"); result.handle = -1; - if (ast_strlen_zero(temp) || (sscanf(temp, "%d", &result.handle) != 1)) { + if (ast_strlen_zero(temp) || (sscanf(temp, "%30d", &result.handle) != 1)) { result.handle = -1; } temp = pbx_builtin_getvar_helper(chan, "OSPRESULTS"); - if (ast_strlen_zero(temp) || (sscanf(temp, "%d", &result.numresults) != 1)) { + if (ast_strlen_zero(temp) || (sscanf(temp, "%30d", &result.numresults) != 1)) { result.numresults = 0; } if ((res = ast_osp_next(&result, cause)) > 0) { @@ -301,7 +301,7 @@ static int ospfinished_exec(struct ast_channel *chan, void *data) cause = str2cause(args.status); temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE"); result.handle = -1; - if (!ast_strlen_zero(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) { + if (!ast_strlen_zero(temp) && (sscanf(temp, "%30d", &result.handle) == 1) && (result.handle > -1)) { if (!ast_osp_terminate(result.handle, cause, start, duration)) { pbx_builtin_setvar_helper(chan, "_OSPHANDLE", ""); pbx_builtin_setvar_helper(chan, "OSPFINISHSTATUS", "SUCCESS"); diff --git a/apps/app_privacy.c b/apps/app_privacy.c index 09b1c1556..6196cd5c9 100644 --- a/apps/app_privacy.c +++ b/apps/app_privacy.c @@ -125,13 +125,13 @@ static int privacy_exec (struct ast_channel *chan, void *data) AST_STANDARD_APP_ARGS(args, parse); if (args.maxretries) { - if (sscanf(args.maxretries, "%d", &x) == 1) + if (sscanf(args.maxretries, "%30d", &x) == 1) maxretries = x; else ast_log(LOG_WARNING, "Invalid max retries argument\n"); } if (args.minlength) { - if (sscanf(args.minlength, "%d", &x) == 1) + if (sscanf(args.minlength, "%30d", &x) == 1) minlength = x; else ast_log(LOG_WARNING, "Invalid min length argument\n"); @@ -148,14 +148,14 @@ static int privacy_exec (struct ast_channel *chan, void *data) cfg = ast_config_load(PRIV_CONFIG); if (cfg && (s = ast_variable_retrieve(cfg, "general", "maxretries"))) { - if (sscanf(s, "%d", &x) == 1) + if (sscanf(s, "%30d", &x) == 1) maxretries = x; else ast_log(LOG_WARNING, "Invalid max retries argument\n"); } if (cfg && (s = ast_variable_retrieve(cfg, "general", "minlength"))) { - if (sscanf(s, "%d", &x) == 1) + if (sscanf(s, "%30d", &x) == 1) minlength = x; else ast_log(LOG_WARNING, "Invalid min length argument\n"); diff --git a/apps/app_queue.c b/apps/app_queue.c index a9775328b..1bf241603 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2973,7 +2973,7 @@ static int aqm_exec(struct ast_channel *chan, void *data) } if (!ast_strlen_zero(args.penalty)) { - if ((sscanf(args.penalty, "%d", &penalty) != 1) || penalty < 0) { + if ((sscanf(args.penalty, "%30d", &penalty) != 1) || penalty < 0) { ast_log(LOG_WARNING, "Penalty '%s' is invalid, must be an integer >= 0\n", args.penalty); penalty = 0; } @@ -3062,7 +3062,7 @@ static int queue_exec(struct ast_channel *chan, void *data) /* Get the priority from the variable ${QUEUE_PRIO} */ user_priority = pbx_builtin_getvar_helper(chan, "QUEUE_PRIO"); if (user_priority) { - if (sscanf(user_priority, "%d", &prio) == 1) { + if (sscanf(user_priority, "%30d", &prio) == 1) { if (option_debug) ast_log(LOG_DEBUG, "%s: Got priority %d from ${QUEUE_PRIO}.\n", chan->name, prio); @@ -3716,7 +3716,7 @@ static int manager_add_queue_member(struct mansession *s, struct message *m) if (ast_strlen_zero(penalty_s)) penalty = 0; - else if (sscanf(penalty_s, "%d", &penalty) != 1) { + else if (sscanf(penalty_s, "%30d", &penalty) != 1) { penalty = 0; } @@ -3814,7 +3814,7 @@ static int handle_add_queue_member(int fd, int argc, char *argv[]) queuename = argv[5]; interface = argv[3]; if (argc == 8) { - if (sscanf(argv[7], "%d", &penalty) == 1) { + if (sscanf(argv[7], "%30d", &penalty) == 1) { if (penalty < 0) { ast_cli(fd, "Penalty must be >= 0\n"); penalty = 0; diff --git a/apps/app_random.c b/apps/app_random.c index 789e04beb..caf328487 100644 --- a/apps/app_random.c +++ b/apps/app_random.c @@ -79,7 +79,7 @@ static int random_exec(struct ast_channel *chan, void *data) } prob = strsep(&s,":"); - if ((!prob) || (sscanf(prob, "%d", &probint) != 1)) + if ((!prob) || (sscanf(prob, "%3d", &probint) != 1)) probint = 0; if ((random() % 100) + probint >= 100) { diff --git a/apps/app_readfile.c b/apps/app_readfile.c index bc418aaa1..b97cd826f 100644 --- a/apps/app_readfile.c +++ b/apps/app_readfile.c @@ -89,7 +89,7 @@ static int readfile_exec(struct ast_channel *chan, void *data) } if (length) { - if ((sscanf(length, "%d", &len) != 1) || (len < 0)) { + if ((sscanf(length, "%30d", &len) != 1) || (len < 0)) { ast_log(LOG_WARNING, "%s is not a positive number, defaulting length to max\n", length); len = 0; } diff --git a/apps/app_record.c b/apps/app_record.c index 6d1dfcf21..78e74b01f 100644 --- a/apps/app_record.c +++ b/apps/app_record.c @@ -146,7 +146,7 @@ static int record_exec(struct ast_channel *chan, void *data) return -1; } if (silstr) { - if ((sscanf(silstr, "%d", &i) == 1) && (i > -1)) { + if ((sscanf(silstr, "%30d", &i) == 1) && (i > -1)) { silence = i * 1000; } else if (!ast_strlen_zero(silstr)) { ast_log(LOG_WARNING, "'%s' is not a valid silence duration\n", silstr); @@ -154,7 +154,7 @@ static int record_exec(struct ast_channel *chan, void *data) } if (maxstr) { - if ((sscanf(maxstr, "%d", &i) == 1) && (i > -1)) + if ((sscanf(maxstr, "%30d", &i) == 1) && (i > -1)) /* Convert duration to milliseconds */ maxduration = i * 1000; else if (!ast_strlen_zero(maxstr)) diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c index fc9cd25bf..7dee44ea8 100644 --- a/apps/app_sayunixtime.c +++ b/apps/app_sayunixtime.c @@ -96,7 +96,7 @@ static int sayunixtime_exec(struct ast_channel *chan, void *data) timec = strsep(&s,"|"); if ((timec) && (*timec != '\0')) { long timein; - if (sscanf(timec,"%ld",&timein) == 1) { + if (sscanf(timec,"%30ld",&timein) == 1) { unixtime = (time_t)timein; } } diff --git a/apps/app_sms.c b/apps/app_sms.c index 3a7677601..28293baff 100644 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -748,7 +748,7 @@ static void sms_readfile (sms_t * h, char *fn) H, M, S; - if (sscanf (p, "%d-%d-%dT%d:%d:%d", &Y, &m, &d, &H, &M, &S) == 6) + if (sscanf (p, "%4d-%2d-%2dT%2d:%2d:%2d", &Y, &m, &d, &H, &M, &S) == 6) { struct tm t; t.tm_year = Y - 1900; diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c index 11efe7068..3932a4b44 100644 --- a/apps/app_talkdetect.c +++ b/apps/app_talkdetect.c @@ -97,15 +97,15 @@ static int background_detect_exec(struct ast_channel *chan, void *data) strsep(&stringp, "|"); options = strsep(&stringp, "|"); if (options) { - if ((sscanf(options, "%d", &x) == 1) && (x > 0)) + if ((sscanf(options, "%30d", &x) == 1) && (x > 0)) sil = x; options = strsep(&stringp, "|"); if (options) { - if ((sscanf(options, "%d", &x) == 1) && (x > 0)) + if ((sscanf(options, "%30d", &x) == 1) && (x > 0)) min = x; options = strsep(&stringp, "|"); if (options) { - if ((sscanf(options, "%d", &x) == 1) && (x > 0)) + if ((sscanf(options, "%30d", &x) == 1) && (x > 0)) max = x; } } diff --git a/apps/app_verbose.c b/apps/app_verbose.c index 61c60abed..4c0601d9a 100644 --- a/apps/app_verbose.c +++ b/apps/app_verbose.c @@ -65,7 +65,7 @@ static int verbose_exec(struct ast_channel *chan, void *data) if (vtext) { char *tmp = strsep(&vtext, "|"); if (vtext) { - if (sscanf(tmp, "%d", &vsize) != 1) { + if (sscanf(tmp, "%30d", &vsize) != 1) { vsize = 0; ast_log(LOG_WARNING, "'%s' is not a verboser number\n", vtext); } diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 5b31f41e6..a5b0dafa0 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -463,7 +463,7 @@ static void apply_option(struct ast_vm_user *vmu, const char *var, const char *v } else if (!strcasecmp(var, "sayduration")){ ast_set2_flag(vmu, ast_true(value), VM_SAYDURATION); } else if (!strcasecmp(var, "saydurationm")){ - if (sscanf(value, "%d", &x) == 1) { + if (sscanf(value, "%30d", &x) == 1) { vmu->saydurationm = x; } else { ast_log(LOG_WARNING, "Invalid min duration for say duration\n"); @@ -1042,7 +1042,7 @@ static int last_message_index(struct ast_vm_user *vmu, char *dir) SQLFreeHandle (SQL_HANDLE_STMT, stmt); goto yuck; } - if (sscanf(rowdata, "%d", &x) != 1) + if (sscanf(rowdata, "%30d", &x) != 1) ast_log(LOG_WARNING, "Failed to read message count!\n"); SQLFreeHandle (SQL_HANDLE_STMT, stmt); } else @@ -1096,7 +1096,7 @@ static int message_exists(char *dir, int msgnum) SQLFreeHandle (SQL_HANDLE_STMT, stmt); goto yuck; } - if (sscanf(rowdata, "%d", &x) != 1) + if (sscanf(rowdata, "%30d", &x) != 1) ast_log(LOG_WARNING, "Failed to read message count!\n"); SQLFreeHandle (SQL_HANDLE_STMT, stmt); } else @@ -3695,7 +3695,7 @@ static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *v time_t t; long tin; - if (sscanf(origtime,"%ld",&tin) < 1) { + if (sscanf(origtime,"%30ld",&tin) < 1) { ast_log(LOG_WARNING, "Couldn't find origtime in %s\n", filename); return 0; } @@ -5191,7 +5191,7 @@ static int vm_execmain(struct ast_channel *chan, void *data) ast_log(LOG_WARNING, "No value provided for record gain option\n"); LOCAL_USER_REMOVE(u); return -1; - } else if (sscanf(opts[OPT_ARG_RECORDGAIN], "%d", &gain) != 1) { + } else if (sscanf(opts[OPT_ARG_RECORDGAIN], "%30d", &gain) != 1) { ast_log(LOG_WARNING, "Invalid value '%s' provided for record gain option\n", opts[OPT_ARG_RECORDGAIN]); LOCAL_USER_REMOVE(u); return -1; @@ -5633,7 +5633,7 @@ static int vm_exec(struct ast_channel *chan, void *data) if (ast_test_flag(&flags, OPT_RECORDGAIN)) { int gain; - if (sscanf(opts[OPT_ARG_RECORDGAIN], "%d", &gain) != 1) { + if (sscanf(opts[OPT_ARG_RECORDGAIN], "%30d", &gain) != 1) { ast_log(LOG_WARNING, "Invalid value '%s' provided for record gain option\n", opts[OPT_ARG_RECORDGAIN]); LOCAL_USER_REMOVE(u); return -1; @@ -6067,7 +6067,7 @@ static int load_config(void) vmmaxmessage = 0; if ((s = ast_variable_retrieve(cfg, "general", "maxmessage"))) { - if (sscanf(s, "%d", &x) == 1) { + if (sscanf(s, "%30d", &x) == 1) { vmmaxmessage = x; } else { ast_log(LOG_WARNING, "Invalid max message time length\n"); @@ -6076,7 +6076,7 @@ static int load_config(void) vmminmessage = 0; if ((s = ast_variable_retrieve(cfg, "general", "minmessage"))) { - if (sscanf(s, "%d", &x) == 1) { + if (sscanf(s, "%30d", &x) == 1) { vmminmessage = x; if (maxsilence <= vmminmessage) ast_log(LOG_WARNING, "maxsilence should be less than minmessage or you may get empty messages\n"); @@ -6091,7 +6091,7 @@ static int load_config(void) skipms = 3000; if ((s = ast_variable_retrieve(cfg, "general", "maxgreet"))) { - if (sscanf(s, "%d", &x) == 1) { + if (sscanf(s, "%30d", &x) == 1) { maxgreet = x; } else { ast_log(LOG_WARNING, "Invalid max message greeting length\n"); @@ -6099,7 +6099,7 @@ static int load_config(void) } if ((s = ast_variable_retrieve(cfg, "general", "skipms"))) { - if (sscanf(s, "%d", &x) == 1) { + if (sscanf(s, "%30d", &x) == 1) { skipms = x; } else { ast_log(LOG_WARNING, "Invalid skipms value\n"); @@ -6108,7 +6108,7 @@ static int load_config(void) maxlogins = 3; if ((s = ast_variable_retrieve(cfg, "general", "maxlogins"))) { - if (sscanf(s, "%d", &x) == 1) { + if (sscanf(s, "%30d", &x) == 1) { maxlogins = x; } else { ast_log(LOG_WARNING, "Invalid max failed login attempts\n"); @@ -6178,7 +6178,7 @@ static int load_config(void) saydurationminfo = 2; if ((astsaydurationminfo = ast_variable_retrieve(cfg, "general", "saydurationm"))) { - if (sscanf(astsaydurationminfo, "%d", &x) == 1) { + if (sscanf(astsaydurationminfo, "%30d", &x) == 1) { saydurationminfo = x; } else { ast_log(LOG_WARNING, "Invalid min duration for say duration\n"); diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c index 25e651d9e..97e06877f 100644 --- a/apps/app_waitforring.c +++ b/apps/app_waitforring.c @@ -63,7 +63,7 @@ static int waitforring_exec(struct ast_channel *chan, void *data) int res = 0; int ms; - if (!data || (sscanf(data, "%d", &ms) != 1)) { + if (!data || (sscanf(data, "%30d", &ms) != 1)) { ast_log(LOG_WARNING, "WaitForRing requires an argument (minimum seconds)\n"); return 0; } diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c index 64839f352..5f3067a33 100644 --- a/apps/app_waitforsilence.c +++ b/apps/app_waitforsilence.c @@ -157,8 +157,8 @@ static int waitforsilence_exec(struct ast_channel *chan, void *data) res = ast_answer(chan); /* Answer the channel */ - if (!data || ((sscanf(data, "%d|%d", &maxsilence, &iterations) != 2) && - (sscanf(data, "%d", &maxsilence) != 1))) { + if (!data || ((sscanf(data, "%30d|%30d", &maxsilence, &iterations) != 2) && + (sscanf(data, "%30d", &maxsilence) != 1))) { ast_log(LOG_WARNING, "Using default value of 1000ms, 1 iteration\n"); } diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c index 9fea023ed..416cbce73 100644 --- a/apps/app_zapbarge.c +++ b/apps/app_zapbarge.c @@ -272,8 +272,8 @@ static int conf_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); if (!ast_strlen_zero(data)) { - if ((sscanf(data, "Zap/%d", &confno) != 1) && - (sscanf(data, "%d", &confno) != 1)) { + if ((sscanf(data, "Zap/%3d", &confno) != 1) && + (sscanf(data, "%3d", &confno) != 1)) { ast_log(LOG_WARNING, "ZapBarge Argument (if specified) must be a channel number, not '%s'\n", (char *)data); LOCAL_USER_REMOVE(u); return 0; @@ -288,7 +288,7 @@ static int conf_exec(struct ast_channel *chan, void *data) confstr[0] = '\0'; res = ast_app_getdata(chan, "conf-getchannel",confstr, sizeof(confstr) - 1, 0); if (res <0) goto out; - if (sscanf(confstr, "%d", &confno) != 1) + if (sscanf(confstr, "%3d", &confno) != 1) confno = 0; } if (confno) { |