Mesa (master): gallium/auxiliary: fix util_dynarray_trim to 0 to free the data
Luca Barbieri
lb at kemper.freedesktop.org
Tue Apr 13 06:21:26 UTC 2010
Module: Mesa
Branch: master
Commit: c57261981702f78f0df1426c405a7e891ef81639
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c57261981702f78f0df1426c405a7e891ef81639
Author: Luca Barbieri <luca at luca-barbieri.com>
Date: Tue Apr 13 08:18:59 2010 +0200
gallium/auxiliary: fix util_dynarray_trim to 0 to free the data
This works better and preserves the
data != 0 if and only if capacity != 0 invariant.
---
src/gallium/auxiliary/util/u_dynarray.h | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_dynarray.h b/src/gallium/auxiliary/util/u_dynarray.h
index 94a882b..5d12483 100644
--- a/src/gallium/auxiliary/util/u_dynarray.h
+++ b/src/gallium/auxiliary/util/u_dynarray.h
@@ -81,8 +81,14 @@ util_dynarray_grow(struct util_dynarray *buf, int size)
static INLINE void
util_dynarray_trim(struct util_dynarray *buf)
{
- buf->data = REALLOC(buf->data, buf->capacity, buf->size);
- buf->capacity = buf->size;
+ if(buf->size) {
+ buf->data = REALLOC(buf->data, buf->capacity, buf->size);
+ buf->capacity = buf->size;
+ } else {
+ FREE(buf->data);
+ buf->data = 0;
+ buf->capacity = 0;
+ }
}
#define util_dynarray_append(buf, type, v) do {type __v = (v); memcpy(util_dynarray_grow((buf), sizeof(type)), &__v, sizeof(type));} while(0)
More information about the mesa-commit
mailing list