From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXohD-0002pW-LV for qemu-devel@nongnu.org; Tue, 17 Mar 2015 06:26:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXoh8-0003bT-NP for qemu-devel@nongnu.org; Tue, 17 Mar 2015 06:25:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34080) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXoh8-0003bN-Hv for qemu-devel@nongnu.org; Tue, 17 Mar 2015 06:25:54 -0400 From: Markus Armbruster Date: Tue, 17 Mar 2015 11:25:50 +0100 Message-Id: <1426587950-4015-2-git-send-email-armbru@redhat.com> In-Reply-To: <1426587950-4015-1-git-send-email-armbru@redhat.com> References: <1426587950-4015-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 1/1] coverity: Fix g_malloc_n-like models List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jan Kiszka From: Jan Kiszka Allocate the calculated overall size, not only the size of a single element. Signed-off-by: Jan Kiszka Signed-off-by: Markus Armbruster --- scripts/coverity-model.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/coverity-model.c b/scripts/coverity-model.c index 58356af..cdda259 100644 --- a/scripts/coverity-model.c +++ b/scripts/coverity-model.c @@ -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 -- 1.9.3