aboutsummaryrefslogtreecommitdiff
path: root/dep/jemalloc/src/rtree.c
diff options
context:
space:
mode:
authorShocker <shocker@freakz.ro>2012-04-16 18:19:57 -0700
committerShocker <shocker@freakz.ro>2012-04-16 18:19:57 -0700
commitd6133d102800c80d55c103ae27ab8fb7e18f2f1d (patch)
tree8896ab1d5c2131fd2ea645f2bea962d336462b5f /dep/jemalloc/src/rtree.c
parent3189b57bf527fa82faea289400c61a3f969d390a (diff)
parent126fd13e5d6b57dc0c8830248d44db504c7d103f (diff)
Merge pull request #6187 from GiR-Blunti/master
Updated jemalloc library to version 2.2.5
Diffstat (limited to 'dep/jemalloc/src/rtree.c')
-rw-r--r--dep/jemalloc/src/rtree.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/dep/jemalloc/src/rtree.c b/dep/jemalloc/src/rtree.c
index 7753743c5e6..eb0ff1e24af 100644
--- a/dep/jemalloc/src/rtree.c
+++ b/dep/jemalloc/src/rtree.c
@@ -1,4 +1,4 @@
-#define RTREE_C_
+#define JEMALLOC_RTREE_C_
#include "jemalloc/internal/jemalloc_internal.h"
rtree_t *
@@ -20,7 +20,10 @@ rtree_new(unsigned bits)
memset(ret, 0, offsetof(rtree_t, level2bits) + (sizeof(unsigned) *
height));
- malloc_mutex_init(&ret->mutex);
+ if (malloc_mutex_init(&ret->mutex)) {
+ /* Leak the rtree. */
+ return (NULL);
+ }
ret->height = height;
if (bits_per_level * height > bits)
ret->level2bits[0] = bits % bits_per_level;