RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix NULL pointer dereference in demux_mkv that happens when 

demux_mkv_get_sub_lang (or demux_mkv_get_audio_lang) is called with an invalid
track number.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23205 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2007-05-01 23:04:21 +00:00
parent a03e13b756
commit 476078aed2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmpdemux/demux_mkv.c
View File

@ -3738,7 +3738,7 @@ demux_mkv_get_sub_lang(demuxer_t *demuxer, int track_num, char *lang,
{
mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv;
mkv_track_t *track = demux_mkv_find_track_by_num (mkv_d, track_num, MATROSKA_TRACK_SUBTITLE);
if (track->language && strcmp(track->language, "und"))
if (track && track->language && strcmp(track->language, "und"))
strlcpy(lang, track->language, maxlen);
}
@ -3758,7 +3758,7 @@ demux_mkv_get_audio_lang(demuxer_t *demuxer, int track_num, char *lang,
{
mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv;
mkv_track_t *track = demux_mkv_find_track_by_num (mkv_d, track_num, MATROSKA_TRACK_AUDIO);
if (track->language && strcmp(track->language, "und"))
if (track && track->language && strcmp(track->language, "und"))
strlcpy(lang, track->language, maxlen);
}