[vlc-commits] demux:mkv: avoid recursive calls in case of bogus/dummy data

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jan 22 15:13:59 2018 +0100| [ac2c3dd4c02a551a439565134eced37e5a713d50] | committer: Jean-Baptiste Kempf

demux:mkv: avoid recursive calls in case of bogus/dummy data

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/mkv/Ebml_parser.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/demux/mkv/Ebml_parser.cpp b/modules/demux/mkv/Ebml_parser.cpp
index b765f088b8..b64df7cca1 100644
--- a/modules/demux/mkv/Ebml_parser.cpp
+++ b/modules/demux/mkv/Ebml_parser.cpp
@@ -154,6 +154,7 @@ EbmlElement *EbmlParser::Get( int n_call )
         return ret;
     }
 
+next:
     p_prev = m_el[mi_level];
     if( p_prev )
         p_prev->SkipData( *m_es, EBML_CONTEXT(p_prev) );
@@ -274,7 +275,8 @@ EbmlElement *EbmlParser::Get( int n_call )
             /* The element fits inside its upper element */
             msg_Warn( p_demux, "Dummy element found %" PRIu64 "... skipping it",
                       m_el[mi_level]->GetElementPosition() );
-            return Get( ++n_call );
+            n_call++;
+            goto next;
         }
         else
         {