[vlc-commits] mkv: Ensure we don't use an EbmlDummy element for something it's not
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Fri Sep 18 14:53:15 2020 +0200| [ec1f55ee9ace5cc675395a1bc9700d99679e7e8c] | committer: Hugo Beauzée-Luyssen mkv: Ensure we don't use an EbmlDummy element for something it's not Reported by: Zhen Zhou, NSFOCUS Security (cherry picked from commit 89093b8c033d6dee3d16bebf4a7df6abad4105b8) Signed-off-by: Hugo Beauzée-Luyssen > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=ec1f55ee9ace5cc675395a1bc9700d99679e7e8c --- modules/demux/mkv/mkv.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp index 38a62aa2af..fa9a1e81a5 100644 --- a/modules/demux/mkv/mkv.hpp +++ b/modules/demux/mkv/mkv.hpp @@ -113,7 +113,7 @@ enum #define MKVD_TIMECODESCALE 100 -#define MKV_IS_ID( el, C ) ( el != NULL && (el->operator const EbmlId&()) == (C::ClassInfos.ClassId()) ) +#define MKV_IS_ID( el, C ) ( el != NULL && (el->operator const EbmlId&()) == (C::ClassInfos.ClassId()) && !el->IsDummy() ) #define MKV_CHECKED_PTR_DECL( name, type, src ) type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL #define MKV_CHECKED_PTR_DECL_CONST( name, type, src ) const type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] mkv: Ensure we don't use an EbmlDummy element for something it's not
vlc | branch: master | Hugo Beauzée-Luyssen | Fri Sep 18 14:53:15 2020 +0200| [89093b8c033d6dee3d16bebf4a7df6abad4105b8] | committer: Hugo Beauzée-Luyssen mkv: Ensure we don't use an EbmlDummy element for something it's not Reported by: Zhen Zhou, NSFOCUS Security > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=89093b8c033d6dee3d16bebf4a7df6abad4105b8 --- modules/demux/mkv/mkv.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp index 5d8c24603b..048f41532e 100644 --- a/modules/demux/mkv/mkv.hpp +++ b/modules/demux/mkv/mkv.hpp @@ -112,7 +112,7 @@ enum #define MKVD_TIMECODESCALE 100 -#define MKV_IS_ID( el, C ) ( el != NULL && (el->operator const EbmlId&()) == (C::ClassInfos.ClassId()) ) +#define MKV_IS_ID( el, C ) ( el != NULL && (el->operator const EbmlId&()) == (C::ClassInfos.ClassId()) && !el->IsDummy() ) #define MKV_CHECKED_PTR_DECL( name, type, src ) type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL #define MKV_CHECKED_PTR_DECL_CONST( name, type, src ) const type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
