diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-04-18 06:53:47 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-04-18 06:53:47 +0000 |
| commit | 2f33780bfab55524e701e89399bec23185ba9f9f (patch) | |
| tree | 991bd687a65a196f792192143682fc458107c986 /apps/app_setcallerid.c | |
| parent | 19f7e8cc93b76a2219f5ac4fb8687619022bc056 (diff) | |
Merged revisions 114242 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114242 | tilghman | 2008-04-18 01:49:16 -0500 (Fri, 18 Apr 2008) | 3 lines
For consistency sake, ensure that the values that ${CALLINGPRES} returns are valid as an
input to SetCallingPres. (Closes issue #12472)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114243 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_setcallerid.c')
| -rw-r--r-- | apps/app_setcallerid.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c index c76b80eef..f1c9df3cb 100644 --- a/apps/app_setcallerid.c +++ b/apps/app_setcallerid.c @@ -68,7 +68,11 @@ static int setcallerid_pres_exec(struct ast_channel *chan, void *data) deprecated = 1; ast_log(LOG_WARNING, "SetCallerPres is deprecated. Please use Set(CALLERPRES()=%s) instead.\n", (char *)data); } - pres = ast_parse_caller_presentation(data); + + /* For interface consistency, permit the argument to be specified as a number */ + if (sscanf(data, "%d", &pres) != 1 || pres < 0 || pres > 255 || (pres & 0x9c)) { + pres = ast_parse_caller_presentation(data); + } if (pres < 0) { ast_log(LOG_WARNING, "'%s' is not a valid presentation (see 'show application SetCallerPres')\n", |