Mesa (master): util: Use util_is_power_of_two_nonzero in u_vector

Ian Romanick idr at kemper.freedesktop.org
Thu Mar 29 22:24:37 UTC 2018


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

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Mon Mar 26 10:52:43 2018 -0700

util: Use util_is_power_of_two_nonzero in u_vector

Previously size=0, element_size=0 would have been allowed.  That
combination can only lead to despair.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>

---

 src/util/u_vector.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/u_vector.c b/src/util/u_vector.c
index bec6e5bbc3..15f8ed6bda 100644
--- a/src/util/u_vector.c
+++ b/src/util/u_vector.c
@@ -37,8 +37,8 @@
 int
 u_vector_init(struct u_vector *vector, uint32_t element_size, uint32_t size)
 {
-   assert(util_is_power_of_two_or_zero(size));
-   assert(element_size < size && util_is_power_of_two_or_zero(element_size));
+   assert(util_is_power_of_two_nonzero(size));
+   assert(element_size < size && util_is_power_of_two_nonzero(element_size));
 
    vector->head = 0;
    vector->tail = 0;




More information about the mesa-commit mailing list