[vlc-commits] [Git][videolan/vlc][3.0.x] demux: ts: fix potential NULL deref with broken descriptors

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch 3.0.x at VideoLAN / VLC


Commits:
eded2e86 by François Cartegnie at 2026-03-27T17:47:53+01:00
demux: ts: fix potential NULL deref with broken descriptors

refs #29684 #29682

(cherry picked from commit 6e53bd3ec5fb52f05a9c37d2aa6470a3506ee596)

- - - - -


1 changed file:

- modules/demux/mpeg/ts_psi.c


Changes:

=====================================
modules/demux/mpeg/ts_psi.c
=====================================
@@ -271,8 +271,11 @@ static void ParsePMTRegistrations( demux_t *p_demux, const dvbpsi_descriptor_t
             case 0x09:
             {
                 dvbpsi_ca_dr_t *p_cadr = dvbpsi_DecodeCADr( (dvbpsi_descriptor_t *) p_dr );
-                msg_Dbg( p_demux, PMT_DESC_INDENT "CA System ID 0x%x", p_cadr->i_ca_system_id );
-                i_arib_score_flags |= (p_cadr->i_ca_system_id == 0x05);
+                if( p_cadr )
+                {
+                    msg_Dbg( p_demux, PMT_DESC_INDENT "CA System ID 0x%x", p_cadr->i_ca_system_id );
+                    i_arib_score_flags |= (p_cadr->i_ca_system_id == 0x05);
+                }
             }
             break;
 
@@ -1150,8 +1153,8 @@ static void PMTSetupEs0x06( demux_t *p_demux, ts_stream_t *p_pes,
     {
         dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_dvbpsies, 0x52 );
         dvbpsi_stream_identifier_dr_t *p_si = dvbpsi_DecodeStreamIdentifierDr( p_dr );
-
-        msg_Dbg( p_demux, "    * Stream Component Identifier: %d", p_si->i_component_tag );
+        if( p_si )
+            msg_Dbg( p_demux, "    * Stream Component Identifier: %d", p_si->i_component_tag );
     }
 }
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/eded2e8664db7c70733955417b8eb3960136e2ea

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/eded2e8664db7c70733955417b8eb3960136e2ea
You're receiving this email because of your account on code.videolan.org.