From 9dbace5cd3f0ceee981054f495567d901fd5a0a2 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 29 May 2003 19:39:46 +0000 Subject: [PATCH] Fixed a segfault in the Matroska reader. --- ChangeLog | 2 ++ r_matroska.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cd688094..62b279e44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2003-05-29 Moritz Bunkus + * Fixed a segfault in the Matroska reader. + * Removed the '--sub-type' switch as all text subtitles will be stored in UTF-8 format. Made iconv mandatory in the configure checks for this very reason. diff --git a/r_matroska.cpp b/r_matroska.cpp index 26b5ef120..6a2cf96af 100644 --- a/r_matroska.cpp +++ b/r_matroska.cpp @@ -13,7 +13,7 @@ /*! \file - \version \$Id: r_matroska.cpp,v 1.41 2003/05/26 21:49:11 mosu Exp $ + \version \$Id: r_matroska.cpp,v 1.42 2003/05/29 19:39:46 mosu Exp $ \brief Matroska reader \author Moritz Bunkus */ @@ -739,7 +739,7 @@ int mkv_reader_c::read_headers() { string(lang).c_str()); track->language = safestrdup(string(lang).c_str()); - } else if (!is_ebmlvoid(l4)) + } else if (!is_ebmlvoid(l3)) fprintf(stdout, "matroska_reader: | + unknown element@3: " "%s\n", typeid(*l3).name()); if (upper_lvl_el > 0) { // we're coming from l4 @@ -756,7 +756,7 @@ int mkv_reader_c::read_headers() { } } // while (l3 != NULL) - } else if (!is_ebmlvoid(l4)) + } else if (!is_ebmlvoid(l2)) fprintf(stdout, "matroska_reader: | + unknown element@2: %s, " "ule %d\n", typeid(*l2).name(), upper_lvl_el); if (upper_lvl_el > 0) { // we're coming from l3