[vlc-commits] demux: ts: fix leak on unselected programs

Francois Cartegnie git at videolan.org
Thu Jan 21 18:35:12 CET 2016


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jan 21 18:33:53 2016 +0100| [dae94bd67704a8e9534cb0c04e6ece3e62d881da] | committer: Francois Cartegnie

demux: ts: fix leak on unselected programs

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dae94bd67704a8e9534cb0c04e6ece3e62d881da
---

 modules/demux/mpeg/ts.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index bb2f28c..c1ca125 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -2445,13 +2445,17 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid, block_t *p_pes )
                             else
                             {
                                 if( p_es_send->id )
+                                {
                                     es_out_Send( p_demux->out, p_es_send->id, p_block );
-                                else
-                                    block_Release( p_block ); /* Goes nowhere */
+                                    p_block = NULL;
+                                }
                             }
                         }
                         p_es_send = p_es_send->p_next;
                     }
+
+                    if( p_block )
+                        block_Release( p_block );
                 }
             }
             else



More information about the vlc-commits mailing list