mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: support: allow spa_log_xxx(NULL, ...) again with UBSan

Browse source 
Calling the spa_log_xxx macros with NULL log used to be allowed,
and it's used in some tests.

Write the NULL check in a way the compiler can understand and make UBSan
a happy UBSan.
This commit is contained in:
Pauli Virtanen 2023-10-14 18:20:22 +03:00 • committed by Wim Taymans
parent 960ca82552
commit ca0e886159
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spa/include/spa/support/log.h
View file

@ -208,12 +208,13 @@ static inline bool spa_log_level_topic_enabled(const struct spa_log *log,
{ {
enum spa_log_level max_level; enum spa_log_level max_level;
if (SPA_UNLIKELY(!log))
return false;
if (topic && topic->has_custom_level) if (topic && topic->has_custom_level)
max_level = topic->level; max_level = topic->level;
else if (log)
max_level = log->level;
else else
max_level = SPA_LOG_LEVEL_NONE; max_level = log->level;
return level <= max_level; return level <= max_level;
} }
@ -222,8 +223,8 @@ static inline bool spa_log_level_topic_enabled(const struct spa_log *log,
#define spa_log_logt(l,lev,topic,...) \ #define spa_log_logt(l,lev,topic,...) \
({ \ ({ \
struct spa_log *_l = l; \ struct spa_log *_l = l; \
struct spa_interface *_if = &_l->iface; \
if (SPA_UNLIKELY(spa_log_level_topic_enabled(_l, topic, lev))) { \ if (SPA_UNLIKELY(spa_log_level_topic_enabled(_l, topic, lev))) { \
struct spa_interface *_if = &_l->iface; \
if (!spa_interface_call(_if, \ if (!spa_interface_call(_if, \
struct spa_log_methods, logt, 1, \ struct spa_log_methods, logt, 1, \
lev, topic, \ lev, topic, \
@ -238,8 +239,8 @@ static inline bool spa_log_level_topic_enabled(const struct spa_log *log,
#define spa_log_logtv(l,lev,topic,...) \ #define spa_log_logtv(l,lev,topic,...) \
({ \ ({ \
struct spa_log *_l = l; \ struct spa_log *_l = l; \
struct spa_interface *_if = &_l->iface; \
if (SPA_UNLIKELY(spa_log_level_topic_enabled(_l, topic, lev))) { \ if (SPA_UNLIKELY(spa_log_level_topic_enabled(_l, topic, lev))) { \
struct spa_interface *_if = &_l->iface; \
if (!spa_interface_call(_if, \ if (!spa_interface_call(_if, \
struct spa_log_methods, logtv, 1, \ struct spa_log_methods, logtv, 1, \
lev, topic, \ lev, topic, \