mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: bluez: backend-native: fix filtered number memory leak

Browse source 
The `number_filtered` variable was dynamically allocated but never freed.
This commit is contained in:
Barnabás Pőcze 2022-11-14 16:05:00 +01:00 • committed by Wim Taymans
parent 93d2571b30
commit 14e044a92c
2 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spa/plugins/bluez5/backend-native.c
View file

@ -1111,10 +1111,10 @@ next_indicator:
return true; return true;
} }
} else if (spa_strstartswith(buf, "ATD")) { } else if (spa_strstartswith(buf, "ATD")) {
char number[31]; char number[31], sep;
enum cmee_error error; enum cmee_error error;
if (sscanf(buf, "ATD%30s;", number) != 1) { if (sscanf(buf, "ATD%30[^;]%c", number, &sep) != 2 || sep != ';') {
spa_log_debug(backend->log, "Failed to parse ATD: \"%s\"", buf); spa_log_debug(backend->log, "Failed to parse ATD: \"%s\"", buf);
rfcomm_send_error(rfcomm, CMEE_AG_FAILURE); rfcomm_send_error(rfcomm, CMEE_AG_FAILURE);
return true; return true;

36
spa/plugins/bluez5/modemmanager.c
View file

@ -1023,35 +1023,25 @@ static void append_basic_variant_dict_entry(DBusMessageIter *dict, const char* k
dbus_message_iter_close_container(dict, &dict_entry_it); dbus_message_iter_close_container(dict, &dict_entry_it);
} }
static inline bool is_valid_dial_string_char(char c)
{
return ('0' <= c && c <= '9')
|| ('A' <= c && c <= 'C')
|| c == '*'
|| c == '#'
|| c == '+';
}
bool mm_do_call(void *modemmanager, const char* number, void *user_data, enum cmee_error *error) bool mm_do_call(void *modemmanager, const char* number, void *user_data, enum cmee_error *error)
{ {
struct impl *this = modemmanager; struct impl *this = modemmanager;
unsigned int k, j;
char *number_filtered;
struct dbus_cmd_data *data; struct dbus_cmd_data *data;
DBusMessage *m; DBusMessage *m;
DBusMessageIter iter, dict; DBusMessageIter iter, dict;
/* Filter extracted number from invalid characters for (size_t i = 0; number[i]; i++) {
* Allowed characters: 0-9, *, #, +, A-C if (!is_valid_dial_string_char(number[i])) {
*/ spa_log_warn(this->log, "Call creation canceled, invalid character found in dial string: %c", number[i]);
k=0;
number_filtered = calloc(1, 30);
for (j=0; j < 30; j++) {
if ((number[j] >= '0' && number[j] <= '9')
|| (number[j] == '*')
|| (number[j] == '#')
|| (number[j] == '+')
|| (number[j] >= 'A' && number[j] <= 'C')) {
number_filtered[k] = number[j];
k++;
}
/* ATD commands ends with ';' */
else if (number[j] == ';')
break;
/* Send error for invalid characters */
else {
spa_log_warn(this->log, "Call creation canceled, invalid character found in dial string: %c", number[j]);
if (error) if (error)
*error = CMEE_INVALID_CHARACTERS_DIAL_STRING; *error = CMEE_INVALID_CHARACTERS_DIAL_STRING;
return false; return false;
@ -1075,7 +1065,7 @@ bool mm_do_call(void *modemmanager, const char* number, void *user_data, enum cm
} }
dbus_message_iter_init_append(m, &iter); dbus_message_iter_init_append(m, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &dict); dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &dict);
append_basic_variant_dict_entry(&dict, "number", DBUS_TYPE_STRING, "s", &number_filtered); append_basic_variant_dict_entry(&dict, "number", DBUS_TYPE_STRING, "s", &number);
dbus_message_iter_close_container(&iter, &dict); dbus_message_iter_close_container(&iter, &dict);
if (!mm_dbus_connection_send_with_reply(this, m, &this->voice_pending, mm_get_call_create_reply, data)) { if (!mm_dbus_connection_send_with_reply(this, m, &this->voice_pending, mm_get_call_create_reply, data)) {
spa_log_error(this->log, "dbus call failure"); spa_log_error(this->log, "dbus call failure");