diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-18 19:18:51 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-18 19:18:51 +0000 |
| commit | bd4ba177c030c3cd5ed2d1780c88755b8446fc76 (patch) | |
| tree | 9c9b6591c2c4a0fae119940f5e0b209bc696149d /apps/app_meetme.c | |
| parent | 4255da284785cecdf9e0d18b3e23e15dafc18d13 (diff) | |
Merged revisions 157366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r157366 | jpeeler | 2008-11-18 13:16:00 -0600 (Tue, 18 Nov 2008) | 14 lines
Merged revisions 157365 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r157365 | jpeeler | 2008-11-18 13:13:33 -0600 (Tue, 18 Nov 2008) | 6 lines
(closes issue #13899)
Reported by: akkornel
This fix is the result of a bug fix in ast_app_separate_args r124395. If an argument does not exist it should always be set to a null string rather than a null pointer.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@157367 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index bdfb801c4..787f73ecc 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -3192,7 +3192,7 @@ static int conf_exec(struct ast_channel *chan, void *data) if (args.options) { ast_app_parse_options(meetme_opts, &confflags, optargs, args.options); dynamic = ast_test_flag(&confflags, CONFFLAG_DYNAMIC | CONFFLAG_DYNAMICPIN); - if (ast_test_flag(&confflags, CONFFLAG_DYNAMICPIN) && !args.pin) + if (ast_test_flag(&confflags, CONFFLAG_DYNAMICPIN) && ast_strlen_zero(args.pin)) strcpy(the_pin, "q"); empty = ast_test_flag(&confflags, CONFFLAG_EMPTY | CONFFLAG_EMPTYNOPIN); |