[vlc-commits] commit: demux/ts.c: dont leak psz_name/ psz_description on multilanguage epg (Ilkka Ollakka )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Mon May 10 17:01:42 2010 +0300| [d438ca84b43e877a88409960b3f94cacc187e37a] | committer: Ilkka Ollakka 

demux/ts.c: dont leak psz_name/psz_description on multilanguage epg

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.
(cherry picked from commit 33f515869ff07841e7b433128f783b518b4156e0)

Signed-off-by: Ilkka Ollakka <ileoo at iki.fi>

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

 modules/demux/ts.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 78332fe..2f1293a 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -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 );