From 43a11b00aadc22293730aab903990e1f2abd7d2b Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 16 Jul 2013 19:28:02 -0500 Subject: [PATCH] Fix segfault in mod_conference This was introduced by commit a4408e62a6ca1bc36e26109396af332d05fae812. FS-5612 --resolve --- src/mod/applications/mod_conference/mod_conference.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 8778e93f5d..7ea86fa973 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -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 */