]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Fix segfault in mod_conference
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 17 Jul 2013 00:28:02 +0000 (19:28 -0500)
committerTravis Cross <tc@traviscross.com>
Thu, 15 Aug 2013 15:59:35 +0000 (15:59 +0000)
This was introduced by commit a4408e62a6ca1bc36e26109396af332d05fae812.

FS-5612 --resolve

src/mod/applications/mod_conference/mod_conference.c

index 8778e93f5d830045329b4d6462bdb60d6fd2f671..7ea86fa973e08b7f2d97065bff80feccdd593e39 100644 (file)
@@ -7670,7 +7670,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 */