Commit 071d4054 authored by Emilio G. Cota's avatar Emilio G. Cota Committed by Paolo Bonzini
Browse files

qdist: use g_renew and g_new instead of g_realloc and g_malloc. 



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: default avatarEmilio G. Cota <cota@braap.org>
Message-Id: <1469459025-23606-3-git-send-email-cota@braap.org>
[Rewritten to use g_new/g_renew. - Paolo]
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f9dbc19e

util/qdist.c

+3 −4
Original line number Diff line number Diff line
@@ -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;