summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ts.c
diff options
context:
space:
mode:
authorgpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-23 08:23:53 +0000
committergpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-23 08:23:53 +0000
commitdd4390af8b129e35a7a026fc4de06c2a0d04aa91 (patch)
treea88c646a3c2a823e05f189cd3fc9fdb06131340c /libmpdemux/demux_ts.c
parentdead4d1193fe79f64138e92fbc776dd31e7a9d0e (diff)
downloadmpv-dd4390af8b129e35a7a026fc4de06c2a0d04aa91.tar.bz2
mpv-dd4390af8b129e35a7a026fc4de06c2a0d04aa91.tar.xz
Crash fix for: "[MPlayer-users] Crash of mencoder in demux_ts.c line 2728"
"The code which crashes looks like its trying to parse the subtitle stream, and failing, I assume because dvbsub_lang is a invalid pointer, or null." Patch by Nico Sabi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16293 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ts.c')
-rw-r--r--libmpdemux/demux_ts.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 620c9612e5..64db74838a 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -2732,6 +2732,8 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
int asgn = 0;
uint8_t *lang;
+ if(dvdsub_lang)
+ {
if(!strcmp(dvdsub_lang, ""))
asgn = 1;
else
@@ -2742,6 +2744,7 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet,
else
asgn = 0;
}
+ }
if(asgn)
{