From 737c06fa38b874c0f39e69c14db90a0ef60ff272 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Tue, 18 Nov 2008 19:18:51 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@157367 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index bdfb801c4c..787f73ecc0 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);