summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLuca Barbieri <luca@luca-barbieri.com>2010-04-13 08:18:59 +0200
committerLuca Barbieri <luca@luca-barbieri.com>2010-04-13 08:18:59 +0200
commitc57261981702f78f0df1426c405a7e891ef81639 (patch)
tree6a718ea8a72a42767b38d5f69eb7f7acbf591569 /src
parent5f968a64dc965c7197c2b85ccf0a596fde366c06 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/gallium/auxiliary/util/u_dynarray.h10
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 94a882b59ee..5d124832be3 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)