openbsd-ports/x11/vlc/patches/patch-modules_demux_mkv_mkv_hpp
2011-04-12 22:40:20 +00:00

25 lines
787 B
Plaintext

$OpenBSD: patch-modules_demux_mkv_mkv_hpp,v 1.3 2011/04/12 22:40:20 sthen Exp $
Insufficient input validation in MKV demuxer. CVE-2011-0531
--- modules/demux/mkv/mkv.hpp.orig Thu Apr 15 12:52:46 2010
+++ modules/demux/mkv/mkv.hpp Sun Feb 27 02:00:13 2011
@@ -93,7 +93,7 @@
#include "matroska/KaxSegment.h"
#include "matroska/KaxTag.h"
#include "matroska/KaxTags.h"
-#include "matroska/KaxTagMulti.h"
+//#include "matroska/KaxTagMulti.h"
#include "matroska/KaxTracks.h"
#include "matroska/KaxTrackAudio.h"
#include "matroska/KaxTrackVideo.h"
@@ -130,7 +130,7 @@ extern "C" {
#endif
-#define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId )
+#define MKV_IS_ID( el, C ) ( el != NULL && typeid( *el ) == typeid( C ) )
using namespace LIBMATROSKA_NAMESPACE;