]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-5612 --resolve
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 17 Jul 2013 00:28:02 +0000 (19:28 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Wed, 17 Jul 2013 00:28:02 +0000 (19:28 -0500)
src/mod/applications/mod_conference/mod_conference.c

index 89850e262cf47896dc1fc14a31aa6412ba0b402d..1aa4022740718344a34fb076747f8834ae7d4910 100644 (file)
@@ -7753,7 +7753,9 @@ SWITCH_STANDARD_APP(conference_function)
                        }
 
                        while (!pin_valid && pin_retries && status == SWITCH_STATUS_SUCCESS) {
-                               int maxpin = strlen(dpin) > strlen(mdpin) ? strlen(dpin) : strlen(mdpin);
+                               size_t dpin_length = dpin ? strlen(dpin) : 0;
+                               size_t mdpin_length = mdpin ? strlen(mdpin) : 0;
+                               int maxpin = dpin_length > mdpin_length ? dpin_length : mdpin_length;
                                switch_status_t pstatus = SWITCH_STATUS_FALSE;
 
                                /* be friendly */