From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUzab-0006Uw-SL for qemu-devel@nongnu.org; Wed, 03 Aug 2016 13:04:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUzaX-0001nn-P5 for qemu-devel@nongnu.org; Wed, 03 Aug 2016 13:04:17 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:35663) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUzaX-0001nU-I1 for qemu-devel@nongnu.org; Wed, 03 Aug 2016 13:04:13 -0400 Received: by mail-wm0-x243.google.com with SMTP id i5so37290693wmg.2 for ; Wed, 03 Aug 2016 10:04:13 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 3 Aug 2016 19:04:08 +0200 Message-Id: <1470243848-11763-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1470243848-11763-1-git-send-email-pbonzini@redhat.com> References: <1470243848-11763-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 11/25] qdist: use g_renew and g_new instead of g_realloc and g_malloc. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Emilio G. Cota" From: "Emilio G. Cota" This is safer against overflow. g_renew is available in all version of glib, while g_realloc_n is only available in 2.24. Signed-off-by: Emilio G. Cota Message-Id: <1469459025-23606-3-git-send-email-cota@braap.org> [Rewritten to use g_new/g_renew. - Paolo] Signed-off-by: Paolo Bonzini --- util/qdist.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/util/qdist.c b/util/qdist.c index eb2236c..e95722b 100644 --- a/util/qdist.c +++ b/util/qdist.c @@ -16,7 +16,7 @@ void qdist_init(struct qdist *dist) { - dist->entries = g_malloc(sizeof(*dist->entries)); + dist->entries = g_new(struct qdist_entry, 1); dist->size = 1; dist->n = 0; } @@ -62,8 +62,7 @@ void qdist_add(struct qdist *dist, double x, long count) if (unlikely(dist->n == dist->size)) { dist->size *= 2; - dist->entries = g_realloc(dist->entries, - sizeof(*dist->entries) * (dist->size)); + dist->entries = g_renew(struct qdist_entry, dist->entries, dist->size); } dist->n++; entry = &dist->entries[dist->n - 1]; @@ -188,7 +187,7 @@ void qdist_bin__internal(struct qdist *to, const struct qdist *from, size_t n) } } /* they're equally spaced, so copy the dist and bail out */ - to->entries = g_realloc_n(to->entries, n, sizeof(*to->entries)); + to->entries = g_renew(struct qdist_entry, to->entries, n); to->n = from->n; memcpy(to->entries, from->entries, sizeof(*to->entries) * to->n); return; -- 2.7.4