aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-01-26 21:37:15 +0100
committerMarkus Armbruster <armbru@redhat.com>2015-02-05 17:16:11 +0100
commit7ad4c7200111d20eb97eed4f46b6026e3f0b0eef (patch)
treecabd6bb3d7f33267f2fbb153d946495fa268882b
parente4b77daa5724a9dd41aaa44d2dea4b8e92351081 (diff)
coverity: Model g_free() isn't necessarily free()
Memory allocated with GLib needs to be freed with GLib. Freeing it with free() instead of g_free() is a common error. Harmless when g_free() is a trivial wrapper around free(), which is commonly the case. But model the difference anyway. In a local scan, this flags four ALLOC_FREE_MISMATCH. Requires --enable ALLOC_FREE_MISMATCH, because the checker is still preview. Signed-off-by: Markus Armbruster <armbru@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--scripts/coverity-model.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/coverity-model.c b/scripts/coverity-model.c
index 230bc30cf9..58356afa66 100644
--- a/scripts/coverity-model.c
+++ b/scripts/coverity-model.c
@@ -125,7 +125,7 @@ void *g_malloc_n(size_t nmemb, size_t size)
sz = nmemb * size;
ptr = __coverity_alloc__(size);
__coverity_mark_as_uninitialized_buffer__(ptr);
- __coverity_mark_as_afm_allocated__(ptr, AFM_free);
+ __coverity_mark_as_afm_allocated__(ptr, "g_free");
return ptr;
}
@@ -139,7 +139,7 @@ void *g_malloc0_n(size_t nmemb, size_t size)
sz = nmemb * size;
ptr = __coverity_alloc__(size);
__coverity_writeall0__(ptr);
- __coverity_mark_as_afm_allocated__(ptr, AFM_free);
+ __coverity_mark_as_afm_allocated__(ptr, "g_free");
return ptr;
}
@@ -157,14 +157,14 @@ void *g_realloc_n(void *ptr, size_t nmemb, size_t size)
* model that. See Coverity's realloc() model
*/
__coverity_writeall__(ptr);
- __coverity_mark_as_afm_allocated__(ptr, AFM_free);
+ __coverity_mark_as_afm_allocated__(ptr, "g_free");
return ptr;
}
void g_free(void *ptr)
{
__coverity_free__(ptr);
- __coverity_mark_as_afm_freed__(ptr, AFM_free);
+ __coverity_mark_as_afm_freed__(ptr, "g_free");
}
/*
@@ -250,7 +250,7 @@ char *g_strdup(const char *s)
__coverity_string_null_sink__(s);
__coverity_string_size_sink__(s);
dup = __coverity_alloc_nosize__();
- __coverity_mark_as_afm_allocated__(dup, AFM_free);
+ __coverity_mark_as_afm_allocated__(dup, "g_free");
for (i = 0; (dup[i] = s[i]); i++) ;
return dup;
}
@@ -284,7 +284,7 @@ char *g_strdup_printf(const char *format, ...)
s = __coverity_alloc_nosize__();
__coverity_writeall__(s);
- __coverity_mark_as_afm_allocated__(s, AFM_free);
+ __coverity_mark_as_afm_allocated__(s, "g_free");
return s;
}
@@ -301,7 +301,7 @@ char *g_strdup_vprintf(const char *format, va_list ap)
s = __coverity_alloc_nosize__();
__coverity_writeall__(s);
- __coverity_mark_as_afm_allocated__(s, AFM_free);
+ __coverity_mark_as_afm_allocated__(s, "g_free");
return len;
}
@@ -317,7 +317,7 @@ char *g_strconcat(const char *s, ...)
s = __coverity_alloc_nosize__();
__coverity_writeall__(s);
- __coverity_mark_as_afm_allocated__(s, AFM_free);
+ __coverity_mark_as_afm_allocated__(s, "g_free");
return s;
}