Commit 5a499283 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-cov-model-2015-03-17' into staging 



coverity: Fix g_malloc_n-like models

# gpg: Signature made Tue Mar 17 10:17:56 2015 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-cov-model-2015-03-17:
  coverity: Fix g_malloc_n-like models

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 494a864e 906b8bab

scripts/coverity-model.c

+3 −3
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ void *g_malloc_n(size_t nmemb, size_t size) 
    __coverity_negative_sink__(nmemb);

    __coverity_negative_sink__(size);

    sz = nmemb * size;

    ptr = __coverity_alloc__(size);

    ptr = __coverity_alloc__(sz);

    __coverity_mark_as_uninitialized_buffer__(ptr);

    __coverity_mark_as_afm_allocated__(ptr, "g_free");

    return ptr;
@@ -137,7 +137,7 @@ void *g_malloc0_n(size_t nmemb, size_t size) 
    __coverity_negative_sink__(nmemb);

    __coverity_negative_sink__(size);

    sz = nmemb * size;

    ptr = __coverity_alloc__(size);

    ptr = __coverity_alloc__(sz);

    __coverity_writeall0__(ptr);

    __coverity_mark_as_afm_allocated__(ptr, "g_free");

    return ptr;
@@ -151,7 +151,7 @@ void *g_realloc_n(void *ptr, size_t nmemb, size_t size) 
    __coverity_negative_sink__(size);

    sz = nmemb * size;

    __coverity_escape__(ptr);

    ptr = __coverity_alloc__(size);

    ptr = __coverity_alloc__(sz);

    /*

     * Memory beyond the old size isn't actually initialized.  Can't

     * model that.  See Coverity's realloc() model