decoder: fix potential NULL dereference

8c6482b3 · Rémi Denis-Courmont · 01c1d49b · 8c6482b3
Commit 8c6482b3 authored Apr 02, 2014 by Rémi Denis-Courmont
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

src/input/decoder.c src/input/decoder.c +5 -2

No files found.
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -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"",
+            if( pi_ts1 != NULL )
-                    *pi_ts0, *pi_ts1);
+                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;
        }
    }