]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7513: don't seg when you have a mute png defined that can not be read
authorMichael Jerris <mike@jerris.com>
Fri, 20 Mar 2015 23:03:33 +0000 (19:03 -0400)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:13 +0000 (12:47 -0500)
src/mod/applications/mod_conference/mod_conference.c

index c47df1014bd85e27a7a0537a61ed671e4902b3f5..5c719cee7b48f453ed51579fd206a1539f7d7098 100644 (file)
@@ -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;
                                                        }
                                                }