From: Luca Barbieri <luca@luca-barbieri.com>
Date: Tue, 13 Apr 2010 06:18:59 +0000 (+0200)
Subject: gallium/auxiliary: fix util_dynarray_trim to 0 to free the data
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c57261981702f78f0df1426c405a7e891ef81639;p=mesa.git

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.
---

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)