Merge branch 'scan-build-help' into 'master'HEADmaster

xdgmimecache: Add assertion to silence static analysis false positive

See merge request xdg/xdgmime!38

1 files changed, 11 insertions, 4 deletions

diff --git a/src/xdgmimecache.c b/src/xdgmimecache.c
index 57d7e2b..bdcd6a6 100644
--- a/src/xdgmimecache.c
+++ b/src/xdgmimecache.c
@@ -245,10 +245,15 @@ cache_magic_compare_to_data (XdgMimeCache *cache,
 			     size_t        len, 
 			     int          *prio)
 {
-  xdg_uint32_t priority = GET_UINT32 (cache->buffer, offset);
-  xdg_uint32_t mimetype_offset = GET_UINT32 (cache->buffer, offset + 4);
-  xdg_uint32_t n_matchlets = GET_UINT32 (cache->buffer, offset + 8);
-  xdg_uint32_t matchlet_offset = GET_UINT32 (cache->buffer, offset + 12);
+  xdg_uint32_t priority, mimetype_offset, n_matchlets, matchlet_offset;
+
+  assert (cache->buffer != NULL);
+
+  priority = GET_UINT32 (cache->buffer, offset);
+  mimetype_offset = GET_UINT32 (cache->buffer, offset + 4);
+  n_matchlets = GET_UINT32 (cache->buffer, offset + 8);
+  matchlet_offset = GET_UINT32 (cache->buffer, offset + 12);
+
   if (OUT_OF_BOUNDS (matchlet_offset, n_matchlets, 32, cache->size))
     return NULL;
 
@@ -280,6 +285,8 @@ cache_magic_lookup_data (XdgMimeCache *cache,
 
   xdg_uint32_t j;
 
+  assert (cache->buffer != NULL);
+
   *prio = 0;
 
   list_offset = GET_UINT32 (cache->buffer, 24);