Merge pull request #337 from igchor/fix_memcheck

Fix memcheck errors

Author: bratpiorka

src/base_alloc/base_alloc_global.c

@@ -125,7 +125,7 @@ static void *get_original_alloc(void *user_ptr, size_t *total_size,
     size_t *metadata_loc = (size_t *)((char *)user_ptr - ALLOC_METADATA_SIZE);
 
     // mark the metadata as defined to read the size and offset
-    utils_annotate_memory_undefined(metadata_loc, ALLOC_METADATA_SIZE);
+    utils_annotate_memory_defined(metadata_loc, ALLOC_METADATA_SIZE);
 
     size_t stored_size = *metadata_loc & ((1ULL << 32) - 1);
     size_t ptr_offset_from_original = *metadata_loc >> 32;

src/critnib/critnib.c

@@ -56,6 +56,7 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <string.h>
 
 #include "base_alloc.h"
 #include "base_alloc_global.h"
@@ -187,6 +188,8 @@ struct critnib *critnib_new(void) {
         return NULL;
     }
 
+    memset(c, 0, sizeof(struct critnib));
+
     void *mutex_ptr = util_mutex_init(&c->mutex);
     if (!mutex_ptr) {
         goto err_free_critnib;

test/supp/umf_test-jemalloc_pool.supp

@@ -3,6 +3,5 @@
    Memcheck:Addr8
    fun:memmove
    ...
-   fun:do_rallocx
-   fun:je_realloc
+   fun:op_realloc
 }