[vlc-commits] [Git][videolan/vlc][master] demux: ps: always clean the track format

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
d9f6f6a5 by Alaric Senat at 2025-09-22T12:01:21+00:00
demux: ps: always clean the track format

Conditionally cleaning the track format leads to leaks on ill-formed ps
packets. Usually when a track started allocating fmt metadata and the
input has an unexpected EOF.

The format is always zero initialized so we can count on es_format_Clean
not to double free.

Fixes https://issues.oss-fuzz.com/issues/42503008
Fixes #29013

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/vlc

- - - - -


1 changed file:

- modules/demux/mpeg/ps.c


Changes:

=====================================
modules/demux/mpeg/ps.c
=====================================
@@ -299,11 +299,9 @@ static void Close( vlc_object_t *p_this )
     for( i = 0; i < PS_TK_COUNT; i++ )
     {
         ps_track_t *tk = &p_sys->tk[i];
-        if( tk->b_configured )
-        {
-            es_format_Clean( &tk->fmt );
-            if( tk->es ) es_out_Del( p_demux->out, tk->es );
-        }
+        es_format_Clean( &tk->fmt );
+        if( tk->b_configured && tk->es != NULL )
+            es_out_Del( p_demux->out, tk->es );
     }
 
     ps_psm_destroy( &p_sys->psm );



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/d9f6f6a500e4394c194ab4dde7f5d5ba3c1e9d74

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/d9f6f6a500e4394c194ab4dde7f5d5ba3c1e9d74
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance