From: Brian Paul Date: Tue, 3 May 2016 21:07:56 +0000 (-0600) Subject: gallium/util: change assertion to conditional in util_bitmask_destroy() X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ef5a31fc06d58ad655fd6b71ed3e939147e67108;p=mesa.git 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 --- diff --git a/src/gallium/auxiliary/util/u_bitmask.c b/src/gallium/auxiliary/util/u_bitmask.c index c22f5068923..b15dfd8d678 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); + } }