]> git.sesse.net Git - vlc/commitdiff
demux/ts.c: dont leak psz_name/psz_description on multilanguage epg
authorIlkka Ollakka <ileoo@videolan.org>
Mon, 10 May 2010 14:01:42 +0000 (17:01 +0300)
committerIlkka Ollakka <ileoo@videolan.org>
Mon, 10 May 2010 14:02:46 +0000 (17:02 +0300)
This happens when there are multiple descriptions on event (multilanguage epg).
Only use the first one per event. Maybe someday we handle epg-language as same
as subtitle-language preference.

modules/demux/ts.c

index 78332fe745924335711fa1914d43f535b9115b22..2f1293a9826b64dd31c06211c776a3d99854fc69 100644 (file)
@@ -3012,7 +3012,9 @@ static void EITCallBack( demux_t *p_demux,
             {
                 dvbpsi_short_event_dr_t *pE = dvbpsi_DecodeShortEventDr( p_dr );
 
-                if( pE )
+                /* Only take first description, as we don't handle language-info
+                   for epg atm*/
+                if( pE && psz_name == NULL)
                 {
                     psz_name = EITConvertToUTF8( pE->i_event_name, pE->i_event_name_length,
                                                  p_sys->b_broken_charset );