[asterisk-commits] jpeeler: branch 1.6.1 r157367 - in /branches/1.6.1: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Nov 18 13:18:51 2008
New Revision: 157367

URL: http://svn.digium.com/view/asterisk?view=rev&rev=157367
Log:
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.


........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_meetme.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_meetme.c?view=diff&rev=157367&r1=157366&r2=157367
==============================================================================
--- branches/1.6.1/apps/app_meetme.c (original)
+++ branches/1.6.1/apps/app_meetme.c Tue Nov 18 13:18:51 2008
@@ -3192,7 +3192,7 @@
 	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);