]> git.sesse.net Git - vlc/commitdiff
decoder: fix potential NULL dereference
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 2 Apr 2014 16:30:57 +0000 (19:30 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 2 Apr 2014 16:31:31 +0000 (19:31 +0300)
src/input/decoder.c

index 714bddbb01df881e98b4274e234b863aba0d4cf2..1232a76812e0a72d19023591e26a22c893ef244f 100644 (file)
@@ -1065,8 +1065,11 @@ static void DecoderFixTs( decoder_t *p_dec, mtime_t *pi_ts0, mtime_t *pi_ts1,
         if( pi_ts1 && *pi_ts1 > VLC_TS_INVALID )
             *pi_ts1 += i_es_delay;
         if( input_clock_ConvertTS( p_clock, &i_rate, pi_ts0, pi_ts1, i_ts_bound ) ) {
-            msg_Err(p_dec, "Could not convert timestamps %"PRId64", %"PRId64"",
-                    *pi_ts0, *pi_ts1);
+            if( pi_ts1 != NULL )
+                msg_Err(p_dec, "Could not convert timestamps %"PRId64
+                        ", %"PRId64"", *pi_ts0, *pi_ts1);
+            else
+                msg_Err(p_dec, "Could not convert timestamp %"PRId64, *pi_ts0);
             *pi_ts0 = VLC_TS_INVALID;
         }
     }