From: Michael Jerris <mike@jerris.com>
Date: Fri, 20 Mar 2015 23:03:33 +0000 (-0400)
Subject: FS-7513: don't seg when you have a mute png defined that can not be read
X-Git-Tag: v1.6.2~614^2~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d5590a76a7d7f552ef394d12a33b7c9b091c003;p=thirdparty%2Ffreeswitch.git

FS-7513: don't seg when you have a mute png defined that can not be read
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index c47df1014b..5c719cee7b 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -1861,7 +1861,9 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
 									layer->mute_img = switch_img_read_png(imember->video_mute_png);
 								}
 
-								scale_and_patch(conference, layer, layer->mute_img, SWITCH_TRUE);
+								if (layer->mute_img) {
+									scale_and_patch(conference, layer, layer->mute_img, SWITCH_TRUE);
+								}
 								layer->mute_patched = 1;
 							}
 						}