mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: telephony: ensure NULL strings are converted to "" on D-Bus properties

Browse source
This commit is contained in:
George Kiagiadakis 2024-07-15 11:47:05 +03:00 • committed by Wim Taymans
parent 6534b58d3b
commit a501c887ea
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spa/plugins/bluez5/telephony.c
View file

@ -777,6 +777,12 @@ static const char * const call_state_to_string[] = {
"disconnected", "disconnected",
}; };
static inline const void *safe_string(char **str)
{
static const char *empty_string = "";
return *str ? (const char **) str : &empty_string;
}
static void static void
dbus_iter_append_call_properties(DBusMessageIter *i, struct spa_bt_telephony_call *call) dbus_iter_append_call_properties(DBusMessageIter *i, struct spa_bt_telephony_call *call)
{ {
@ -790,7 +796,8 @@ dbus_iter_append_call_properties(DBusMessageIter *i, struct spa_bt_telephony_cal
dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &line_identification); dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &line_identification);
dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
DBUS_TYPE_STRING_AS_STRING, &variant); DBUS_TYPE_STRING_AS_STRING, &variant);
dbus_message_iter_append_basic(&variant, DBUS_TYPE_STRING, &call->line_identification); dbus_message_iter_append_basic(&variant, DBUS_TYPE_STRING,
safe_string (&call->line_identification));
dbus_message_iter_close_container(&entry, &variant); dbus_message_iter_close_container(&entry, &variant);
dbus_message_iter_close_container(&dict, &entry); dbus_message_iter_close_container(&dict, &entry);
@ -800,7 +807,8 @@ dbus_iter_append_call_properties(DBusMessageIter *i, struct spa_bt_telephony_cal
dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
DBUS_TYPE_STRING_AS_STRING, DBUS_TYPE_STRING_AS_STRING,
&variant); &variant);
dbus_message_iter_append_basic(&variant, DBUS_TYPE_STRING, &call->incoming_line); dbus_message_iter_append_basic(&variant, DBUS_TYPE_STRING,
safe_string (&call->incoming_line));
dbus_message_iter_close_container(&entry, &variant); dbus_message_iter_close_container(&entry, &variant);
dbus_message_iter_close_container(&dict, &entry); dbus_message_iter_close_container(&dict, &entry);
@ -810,7 +818,8 @@ dbus_iter_append_call_properties(DBusMessageIter *i, struct spa_bt_telephony_cal
dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
DBUS_TYPE_STRING_AS_STRING, DBUS_TYPE_STRING_AS_STRING,
&variant); &variant);
dbus_message_iter_append_basic(&variant, DBUS_TYPE_STRING, &call->name); dbus_message_iter_append_basic(&variant, DBUS_TYPE_STRING,
safe_string (&call->name));
dbus_message_iter_close_container(&entry, &variant); dbus_message_iter_close_container(&entry, &variant);
dbus_message_iter_close_container(&dict, &entry); dbus_message_iter_close_container(&dict, &entry);