]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7513: fix possible mem leak
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 17 Feb 2015 21:24:56 +0000 (15:24 -0600)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:03 +0000 (12:47 -0500)
src/mod/applications/mod_conference/mod_conference.c

index b12578407cd90c74ad3dc17b972daad846fc4057..51bd7f4ae99f91d44194fddbe363e3f6e82789d5 100644 (file)
@@ -1680,8 +1680,8 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
                                                layer->mute_patched = 0;
                                        } else {
                                                switch_img_free(&img);
-                                               if (!layer->mute_patched) {
 
+                                               if (!layer->mute_patched) {
                                                        if (imember->video_mute_png || layer->mute_img) {
                                                                reset_layer(conference->canvas, layer);
 
@@ -1697,11 +1697,13 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
                                        
                                        if (img) {
                                                layer->cur_img = img;
+                                               img = NULL;
                                                layer->tagged = 1;
                                        }
                                }
 
                                switch_mutex_unlock(conference->canvas->mutex);
+                               switch_img_free(&img);
                        }
 
                        if (imember->session) {