XSPF: fix leak on colliding track ID

b856ec53 · Rémi Denis-Courmont · 6a4f9be6 · b856ec53
Commit b856ec53 authored Jun 04, 2011 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

modules/demux/playlist/xspf.c modules/demux/playlist/xspf.c +7 -0

No files found.
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -445,6 +445,13 @@ static bool parse_track_node COMPLEX_INTERFACE
                        while( p_sys->i_track_id >= p_sys->i_tracklist_entries )
                            pp[p_sys->i_tracklist_entries++] = NULL;
                    }
+                    else if( p_sys->pp_tracklist[p_sys->i_track_id] != NULL )
+                    {
+                        msg_Err( p_demux, "track ID %d collision",
+                                 p_sys->i_track_id );
+                        vlc_gc_decref( p_new_input );
+                        return false;
+                    }

                    p_sys->pp_tracklist[ p_sys->i_track_id ] = p_new_input;
                    return true;