fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

util: remove recursion from bitset helpers

Browse source 
Recursion can cause a stack overflow when the range is very large.

Fixes: cb558b2b88 ("glsl: add mark_array_elements_referenced() fast path")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13617

Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36430>
This commit is contained in:
Timothy Arceri 2025-07-29 10:24:04 +10:00 • committed by Marge Bot
parent 3a9157a10b
commit 6a217a06d9
1 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/util/bitset.h
View file

@ -226,17 +226,17 @@ __bitset_shl(BITSET_WORD *x, unsigned amount, unsigned n)
static inline bool
__bitset_test_range(const BITSET_WORD *r, unsigned start, unsigned end)
{
const unsigned size = end - start + 1;
const unsigned start_mod = start % BITSET_WORDBITS;
while (start <= end) {
unsigned start_mod = start % BITSET_WORDBITS;
unsigned size = MIN2(BITSET_WORDBITS - start_mod, end - start + 1);
if (start_mod + size <= BITSET_WORDBITS) {
return !BITSET_TEST_RANGE_INSIDE_WORD(r, start, end, 0);
} else {
const unsigned first_size = BITSET_WORDBITS - start_mod;
if (!BITSET_TEST_RANGE_INSIDE_WORD(r, start, start + size - 1, 0))
return true;
return __bitset_test_range(r, start, start + first_size - 1) ||
__bitset_test_range(r, start + first_size, end);
start += size;
}
return false;
}
#define BITSET_TEST_RANGE(x, b, e) \
@ -245,16 +245,12 @@ __bitset_test_range(const BITSET_WORD *r, unsigned start, unsigned end)
static inline void
__bitset_set_range(BITSET_WORD *r, unsigned start, unsigned end)
{
const unsigned size = end - start + 1;
const unsigned start_mod = start % BITSET_WORDBITS;
while (start <= end) {
unsigned start_mod = start % BITSET_WORDBITS;
unsigned size = MIN2(BITSET_WORDBITS - start_mod, end - start + 1);
if (start_mod + size <= BITSET_WORDBITS) {
BITSET_SET_RANGE_INSIDE_WORD(r, start, end);
} else {
const unsigned first_size = BITSET_WORDBITS - start_mod;
__bitset_set_range(r, start, start + first_size - 1);
__bitset_set_range(r, start + first_size, end);
BITSET_SET_RANGE_INSIDE_WORD(r, start, start + size - 1);
start += size;
}
}
@ -264,16 +260,12 @@ __bitset_set_range(BITSET_WORD *r, unsigned start, unsigned end)
static inline void
__bitclear_clear_range(BITSET_WORD *r, unsigned start, unsigned end)
{
const unsigned size = end - start + 1;
const unsigned start_mod = start % BITSET_WORDBITS;
while (start <= end) {
unsigned start_mod = start % BITSET_WORDBITS;
unsigned size = MIN2(BITSET_WORDBITS - start_mod, end - start + 1);
if (start_mod + size <= BITSET_WORDBITS) {
BITSET_CLEAR_RANGE_INSIDE_WORD(r, start, end);
} else {
const unsigned first_size = BITSET_WORDBITS - start_mod;
__bitclear_clear_range(r, start, start + first_size - 1);
__bitclear_clear_range(r, start + first_size, end);
BITSET_CLEAR_RANGE_INSIDE_WORD(r, start, start + size - 1);
start += size;
}
}