Mesa (master): gallium/util: change assertion to conditional in util_bitmask_destroy()

Brian Paul brianp at kemper.freedesktop.org
Tue May 3 21:42:06 UTC 2016


Module: Mesa
Branch: master
Commit: ef5a31fc06d58ad655fd6b71ed3e939147e67108
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef5a31fc06d58ad655fd6b71ed3e939147e67108

Author: Brian Paul <brianp at vmware.com>
Date:   Tue May  3 15:07:56 2016 -0600

gallium/util: change assertion to conditional in util_bitmask_destroy()

If we fail to create a context in the VMware driver we call this function
unconditionally to free a bunch of bit vectors.  Instead of asserting on
a null pointer, just no-op.

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/gallium/auxiliary/util/u_bitmask.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_bitmask.c b/src/gallium/auxiliary/util/u_bitmask.c
index c22f506..b15dfd8 100644
--- a/src/gallium/auxiliary/util/u_bitmask.c
+++ b/src/gallium/auxiliary/util/u_bitmask.c
@@ -320,9 +320,9 @@ util_bitmask_get_first_index(struct util_bitmask *bm)
 void
 util_bitmask_destroy(struct util_bitmask *bm)
 {
-   assert(bm);
-
-   FREE(bm->words);
-   FREE(bm);
+   if (bm) {
+      FREE(bm->words);
+      FREE(bm);
+   }
 }
 




More information about the mesa-commit mailing list