diff options
| author | Corey Farrell <git@cfware.com> | 2017-07-10 15:04:58 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2017-07-13 11:44:14 -0400 |
| commit | 78a50b034368d3a21f81dfce0fc740021092d7f1 (patch) | |
| tree | 56bf02121d7a13e674b39b68081325a0a46fd0df /main/app.c | |
| parent | b0e184f0a7e70dc916c0bc982128934cd1fe7076 (diff) | |
core: Add PARSE_TIMELEN support to ast_parse_arg and ACO.
This adds support for parsing timelen values from config files. This
includes support for all flags which apply to PARSE_INT32. Support for
this parser is added to ACO via the OPT_TIMELEN_T option type.
Fixes an issue where extra characters provided to ast_app_parse_timelen
were ignored, they now cause an error.
Testing is included.
ASTERISK-27117 #close
Change-Id: I6b333feca7e3f83b4ef5bf2636fc0fd613742554
Diffstat (limited to 'main/app.c')
| -rw-r--r-- | main/app.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/main/app.c b/main/app.c index 1eb0741ee..69c96c06c 100644 --- a/main/app.c +++ b/main/app.c @@ -3060,19 +3060,32 @@ int ast_app_parse_timelen(const char *timestr, int *result, enum ast_timelen uni case 'h': case 'H': unit = TIMELEN_HOURS; + if (u[1] != '\0') { + return -1; + } break; case 's': case 'S': unit = TIMELEN_SECONDS; + if (u[1] != '\0') { + return -1; + } break; case 'm': case 'M': if (toupper(u[1]) == 'S') { unit = TIMELEN_MILLISECONDS; + if (u[2] != '\0') { + return -1; + } } else if (u[1] == '\0') { unit = TIMELEN_MINUTES; + } else { + return -1; } break; + default: + return -1; } } |