From: David Fuhrmann <dfuhrmann@videolan.org>
Date: Sun, 22 Mar 2015 18:02:28 +0000 (+0100)
Subject: puzzle: fix error check, do not leak pictures on error
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=5c2fc028e78429b8a9d540c7fa9d227c5efa0620

puzzle: fix error check, do not leak pictures on error

close #14006
---

diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c
index 2fe5e0c8af..6c6433bbee 100644
--- a/modules/video_filter/puzzle.c
+++ b/modules/video_filter/puzzle.c
@@ -289,9 +289,12 @@ picture_t *Filter( filter_t *p_filter, picture_t *p_pic_in ) {
     /* assert no mismatch between sizes */
     if (    p_sys->s_current_param.i_pict_width  != p_sys->s_current_param.i_desk_width
          || p_sys->s_current_param.i_pict_height != p_sys->s_current_param.i_desk_height
-         || p_sys->s_current_param.i_pict_width  != (int) p_fmt_in->i_width
-         || p_sys->s_current_param.i_pict_height != (int) p_fmt_in->i_height )
+         || p_sys->s_current_param.i_pict_width  != (int) p_fmt_in->i_visible_width
+         || p_sys->s_current_param.i_pict_height != (int) p_fmt_in->i_visible_height ) {
+        picture_Release(p_pic_in);
+        picture_Release(p_pic_out);
         return NULL;
+    }
 
     vlc_mutex_lock( &p_sys->lock );