From: Jeff Peeler Date: Tue, 18 Nov 2008 19:16:00 +0000 (+0000) Subject: Merged revisions 157365 via svnmerge from X-Git-Tag: 1.6.2.0-beta1~847 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53f3870ed304c3afaa85800df37f9ee3a1b3ec39;p=thirdparty%2Fasterisk.git 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: https://origsvn.digium.com/svn/asterisk/trunk@157366 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_meetme.c b/apps/app_meetme.c index e16b435b97..66dfba2cf0 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -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);