diff --git a/tools/coverity.c b/tools/coverity.c
index 80fc1c2ad5..3cc248c546 100644
--- a/tools/coverity.c
+++ b/tools/coverity.c
@@ -35,8 +35,30 @@
 void *av_malloc(size_t size) {
     int has_memory;
     __coverity_negative_sink__(size);
-    if(has_memory)
-        return __coverity_alloc__(size);
-    else
+    if (has_memory) {
+        void *ptr = __coverity_alloc__(size);
+        __coverity_mark_as_uninitialized_buffer__(ptr);
+        __coverity_mark_as_afm_allocated__(ptr, "av_free");
+         return ptr;
+    } else {
         return 0;
+    }
+}
+
+void *av_mallocz(size_t size) {
+    int has_memory;
+    __coverity_negative_sink__(size);
+    if (has_memory) {
+        void *ptr = __coverity_alloc__(size);
+        __coverity_writeall0__(ptr);
+        __coverity_mark_as_afm_allocated__(ptr, "av_free");
+        return ptr;
+    } else {
+        return 0;
+    }
+}
+
+void *av_free(void *ptr) {
+    __coverity_free__(ptr);
+    __coverity_mark_as_afm_freed__(ptr, "av_free");
 }