coverity-model: clean up the models for array allocation functions
sz is only used in one place, so replace it with nmemb * size in that one place. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
96915d638c
commit
05ad6857a5
@ -178,13 +178,11 @@ uint8_t replay_get_byte(void)
|
||||
|
||||
void *g_malloc_n(size_t nmemb, size_t size)
|
||||
{
|
||||
size_t sz;
|
||||
void *ptr;
|
||||
|
||||
__coverity_negative_sink__(nmemb);
|
||||
__coverity_negative_sink__(size);
|
||||
sz = nmemb * size;
|
||||
ptr = __coverity_alloc__(sz);
|
||||
ptr = __coverity_alloc__(nmemb * size);
|
||||
__coverity_mark_as_uninitialized_buffer__(ptr);
|
||||
__coverity_mark_as_afm_allocated__(ptr, AFM_free);
|
||||
return ptr;
|
||||
@ -192,13 +190,11 @@ void *g_malloc_n(size_t nmemb, size_t size)
|
||||
|
||||
void *g_malloc0_n(size_t nmemb, size_t size)
|
||||
{
|
||||
size_t sz;
|
||||
void *ptr;
|
||||
|
||||
__coverity_negative_sink__(nmemb);
|
||||
__coverity_negative_sink__(size);
|
||||
sz = nmemb * size;
|
||||
ptr = __coverity_alloc__(sz);
|
||||
ptr = __coverity_alloc__(nmemb * size);
|
||||
__coverity_writeall0__(ptr);
|
||||
__coverity_mark_as_afm_allocated__(ptr, AFM_free);
|
||||
return ptr;
|
||||
@ -206,13 +202,10 @@ void *g_malloc0_n(size_t nmemb, size_t size)
|
||||
|
||||
void *g_realloc_n(void *ptr, size_t nmemb, size_t size)
|
||||
{
|
||||
size_t sz;
|
||||
|
||||
__coverity_negative_sink__(nmemb);
|
||||
__coverity_negative_sink__(size);
|
||||
sz = nmemb * size;
|
||||
__coverity_escape__(ptr);
|
||||
ptr = __coverity_alloc__(sz);
|
||||
ptr = __coverity_alloc__(nmemb * size);
|
||||
/*
|
||||
* Memory beyond the old size isn't actually initialized. Can't
|
||||
* model that. See Coverity's realloc() model
|
||||
|
Loading…
Reference in New Issue
Block a user