[vlc-commits] ts: Account for potential encoding conversion failures

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Mar  1 10:03:24 2018 +0100| [db78e0198f7b3841d28b4a0766721b011bd99fb8] | committer: Hugo Beauzée-Luyssen

ts: Account for potential encoding conversion failures

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=db78e0198f7b3841d28b4a0766721b011bd99fb8
---

 modules/demux/mpeg/ts_si.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mpeg/ts_si.c b/modules/demux/mpeg/ts_si.c
index adb7ad5833..be1471ae24 100644
--- a/modules/demux/mpeg/ts_si.c
+++ b/modules/demux/mpeg/ts_si.c
@@ -261,9 +261,10 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt )
                                         p_sys->b_broken_charset );
 
                 msg_Dbg( p_demux, "    - type=%"PRIu8" provider=%s name=%s",
-                         pD->i_service_type, str1, str2 );
+                         pD->i_service_type,
+                         str1 ? str1 : "(null)", str2 ? str2 : "(null)" );
 
-                if( strcmp( "Service01", str2 ) ) /* Skip bogus libav/ffmpeg SDT */
+                if( str2 != NULL && strcmp( "Service01", str2 ) ) /* Skip bogus libav/ffmpeg SDT */
                 {
                     vlc_meta_SetTitle( p_meta, str2 );
                     vlc_meta_SetPublisher( p_meta, str1 );