diff options
| author | marha <marha@users.sourceforge.net> | 2015-05-26 19:43:34 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-05-26 19:43:34 +0200 |
| commit | 912e881bec8b16f2331225960645c3bdf5a8ba2d (patch) | |
| tree | 92afd568d4b3eaab1faf26d8d95d8c6df0173079 /xorg-server/Xext/hashtable.c | |
| parent | 2e00f3764228cfc91180bbe9375a8d85e0e65a5b (diff) | |
| parent | 843964ee791452b197e41dacb0146f5b456ffaa5 (diff) | |
| download | vcxsrv-912e881bec8b16f2331225960645c3bdf5a8ba2d.tar.gz vcxsrv-912e881bec8b16f2331225960645c3bdf5a8ba2d.tar.bz2 vcxsrv-912e881bec8b16f2331225960645c3bdf5a8ba2d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi_priv.h
mesalib/src/mesa/drivers/dri/swrast/swrast.c
xorg-server/dix/dispatch.c
xorg-server/os/utils.c
xorg-server/record/record.c
Diffstat (limited to 'xorg-server/Xext/hashtable.c')
| -rw-r--r-- | xorg-server/Xext/hashtable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/Xext/hashtable.c b/xorg-server/Xext/hashtable.c index f10ca769d..37505f97a 100644 --- a/xorg-server/Xext/hashtable.c +++ b/xorg-server/Xext/hashtable.c @@ -54,7 +54,7 @@ ht_create(int keySize, ht->elements = 0; ht->bucketBits = INITHASHSIZE; numBuckets = 1 << ht->bucketBits; - ht->buckets = malloc(numBuckets * sizeof(*ht->buckets)); + ht->buckets = xallocarray(numBuckets, sizeof(*ht->buckets)); ht->cdata = cdata; if (ht->buckets) { @@ -92,7 +92,7 @@ double_size(HashTable ht) int newNumBuckets = 1 << newBucketBits; int c; - newBuckets = malloc(newNumBuckets * sizeof(*ht->buckets)); + newBuckets = xallocarray(newNumBuckets, sizeof(*ht->buckets)); if (newBuckets) { for (c = 0; c < newNumBuckets; ++c) { xorg_list_init(&newBuckets[c]); |