Merged revisions 157365 via svnmerge from
authorJeff Peeler <jpeeler@digium.com>
Tue, 18 Nov 2008 19:16:00 +0000 (19:16 +0000)
committerJeff Peeler <jpeeler@digium.com>
Tue, 18 Nov 2008 19:16:00 +0000 (19:16 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@157366 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c

index e16b435..66dfba2 100644 (file)
@@ -3647,7 +3647,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);