From 2c07c54b8a11784fc6119da02aa74f8ebf07cb4f Mon Sep 17 00:00:00 2001 From: Vincent Penquerc'h Date: Thu, 10 Apr 2014 10:29:34 +0100 Subject: [PATCH] oggstream: remove NULL test after dereference And add NULLness asserts at top of function. The only call to this passes local variable pointers, so non NULL. Coverity 206375 --- ext/ogg/gstoggstream.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c index d467c73944..7af157a30c 100644 --- a/ext/ogg/gstoggstream.c +++ b/ext/ogg/gstoggstream.c @@ -1506,6 +1506,9 @@ gst_ogg_map_search_index (GstOggStream * pad, gboolean before, guint64 ts; GstOggIndex *best; + g_return_val_if_fail (timestamp != NULL, FALSE); + g_return_val_if_fail (offset != NULL, FALSE); + n_index = pad->n_index; if (n_index == 0 || pad->index == NULL) return FALSE; @@ -1523,11 +1526,9 @@ gst_ogg_map_search_index (GstOggStream * pad, gboolean before, GST_INFO ("found at index %u", (guint) (best - pad->index)); - if (offset) - *offset = best->offset; - if (timestamp) - *timestamp = - gst_util_uint64_scale (best->timestamp, GST_SECOND, pad->kp_denom); + *offset = best->offset; + *timestamp = + gst_util_uint64_scale (best->timestamp, GST_SECOND, pad->kp_denom); return TRUE; }