osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

wsutil: Add ws_assert_bounds()

This commit is contained in:
João Valverde 2021-05-20 02:54:35 +01:00
parent adfb0b99c2
commit cee1b443b5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/wmem/wmem_array.c
View File

@ -129,7 +129,7 @@ wmem_array_append(wmem_array_t *array, const void *in, guint count)
void *
wmem_array_index(wmem_array_t *array, guint array_index)
{
ws_assert(array_index < array->elem_count);
ws_assert_bounds(array_index < array->elem_count);
return &array->buf[array_index * array->elem_size];
}

5
wsutil/ws_assert.h
View File

@ -43,4 +43,9 @@ WS_NORETURN void ws_assert_not_reached(void) {
abort();
};
/* ws_assert_bounds() is always enabled. For bounds check where the array
* size is known sometimes it's just not worth disabling assertions.
*/
#define ws_assert_bounds(expr) g_assert_true(expr)
#endif /* __WS_ASSERT_H__ */