[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: demux: mkv: check p_private_data is valid before using it

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
48db537d by Steve Lhomme at 2026-03-14T14:35:37+00:00
demux: mkv: check p_private_data is valid before using it

It's done in c6826ae20f58e39e3e980db2b887a7fae0592774 on master but the changes
are too big for the stable VLC 3 branch.

- - - - -
b3c21750 by Peter Pen at 2026-03-14T14:35:37+00:00
demux: mkv: check p_private_data is valid before using it

(cherry picked from commit 1bc17d273913bccc6d6ef008c5a9286d08bbd84d)

- - - - -


1 changed file:

- modules/demux/mkv/chapter_command.cpp


Changes:

=====================================
modules/demux/mkv/chapter_command.cpp
=====================================
@@ -55,7 +55,7 @@ void chapter_codec_cmds_c::AddCommand( const KaxChapterProcessCommand & command
 
 int16 dvd_chapter_codec_c::GetTitleNumber()
 {
-    if ( p_private_data->GetSize() >= 3)
+    if ( p_private_data != nullptr && p_private_data->GetSize() >= 3)
     {
         const binary* p_data = p_private_data->GetBuffer();
         if ( p_data[0] == MATROSKA_DVD_LEVEL_SS )
@@ -101,7 +101,7 @@ bool dvd_chapter_codec_c::EnterLeaveHelper( char const * str_diag, std::vector<K
 std::string dvd_chapter_codec_c::GetCodecName( bool f_for_title ) const
 {
     std::string result;
-    if ( p_private_data->GetSize() >= 3)
+    if ( p_private_data != nullptr && p_private_data->GetSize() >= 3)
     {
         const binary* p_data = p_private_data->GetBuffer();
 /*        if ( p_data[0] == MATROSKA_DVD_LEVEL_TT )



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9afc138206fda201effe58574eb397f07543c5af...b3c21750e85911dc8265c52b6188a7d3c7583af7

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9afc138206fda201effe58574eb397f07543c5af...b3c21750e85911dc8265c52b6188a7d3c7583af7
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance