[vlc-commits] demux/vobsub: Fix out-of-bounds array read

[Marvin Scholz]

vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Tue Dec 10 13:42:46 2019 +0100| [781634e12e8630238fad216dba4a3ce877498f62] | committer: Marvin Scholz

demux/vobsub: Fix out-of-bounds array read

(cherry picked from commit edc61c637b6ff04f374c4eb16421e071e557ea4b)
Signed-off-by: Marvin Scholz <epirat07 at gmail.com>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=781634e12e8630238fad216dba4a3ce877498f62
---

 modules/demux/vobsub.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index 119233b26a..98cdf07ae5 100644
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -293,6 +293,10 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                                 p_sys->track[i].p_es, &b_selected );
                 if( b_selected ) break;
             }
+            if (i >= p_sys->i_tracks) {
+                /* No selected ES found */
+                return VLC_EGENERIC;
+            }
             if( p_sys->track[i].i_current_subtitle >= p_sys->track[i].i_subtitles )
             {
                 *pf = 1.0;