diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-03-15 09:08:00 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-03-15 09:11:28 +0000 |
| commit | 01a8bf01c6508a4fea8d40371c3049e7a2f7908a (patch) | |
| tree | 8b2d8d533a09a87010717a6852db34c5bcea3044 | |
| parent | 2c2dccf5a4d298c866f7c0faed2e10c65252c168 (diff) | |
mempool: Reduce an assert into an error return for get_buddy()
If we ask for a buddy that is outside of our allocation that is an
error that should not happen with a power-of-two allocated zone...
However, since it has been seen in the wild, we can safely return that
there is no buddy rather than die in a too-late assert.
Reported-by: Anton Eliasson <devel@antoneliasson.se>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/cairo-mempool.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cairo-mempool.c b/src/cairo-mempool.c index 96e4a62b..751ede32 100644 --- a/src/cairo-mempool.c +++ b/src/cairo-mempool.c @@ -157,7 +157,8 @@ get_buddy (cairo_mempool_t *pool, size_t offset, int bits) { struct _cairo_memblock *block; - assert (offset + (1 << bits) <= pool->num_blocks); + if (offset + (1 << bits) >= pool->num_blocks) + return NULL; /* invalid */ if (BITTEST (pool, offset + (1 << bits) - 1)) return NULL; /* buddy is allocated */ |