mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: allow spa_dict.items to be NULL for zero items

Browse source 
For dicts with zero items, don't dereference dict->items, or give it to
qsort or bsearch where passing in NULL is not allowed.
This commit is contained in:
Pauli Virtanen 2022-01-20 19:55:02 +02:00
parent 5a72e2769a
commit 870cd0136a
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spa/include/spa/utils/dict.h
View file

@ -74,6 +74,7 @@ static inline int spa_dict_item_compare(const void *i1, const void *i2)
static inline void spa_dict_qsort(struct spa_dict *dict) static inline void spa_dict_qsort(struct spa_dict *dict)
{ {
if (dict->n_items > 0)
qsort((void*)dict->items, dict->n_items, sizeof(struct spa_dict_item), qsort((void*)dict->items, dict->n_items, sizeof(struct spa_dict_item),
spa_dict_item_compare); spa_dict_item_compare);
SPA_FLAG_SET(dict->flags, SPA_DICT_FLAG_SORTED); SPA_FLAG_SET(dict->flags, SPA_DICT_FLAG_SORTED);
@ -84,7 +85,8 @@ static inline const struct spa_dict_item *spa_dict_lookup_item(const struct spa_
{ {
const struct spa_dict_item *item; const struct spa_dict_item *item;
if (SPA_FLAG_IS_SET(dict->flags, SPA_DICT_FLAG_SORTED)) { if (SPA_FLAG_IS_SET(dict->flags, SPA_DICT_FLAG_SORTED) &&
dict->n_items > 0) {
struct spa_dict_item k = SPA_DICT_ITEM_INIT(key, NULL); struct spa_dict_item k = SPA_DICT_ITEM_INIT(key, NULL);
item = (const struct spa_dict_item *)bsearch(&k, item = (const struct spa_dict_item *)bsearch(&k,
(const void *) dict->items, dict->n_items, (const void *) dict->items, dict->n_items,