mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-03-03 01:40:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: telephony: improve +CLCC parsing

Browse source 
Make sure we don't crash or do anything stupid if the incoming
command is malformed
This commit is contained in:
George Kiagiadakis 2024-11-15 17:48:22 +02:00 • committed by Wim Taymans
parent 9d1862a6f8
commit abd96e592b
1 changed files with 67 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2008,68 +2008,90 @@ static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* token)
} }
} else if (spa_strstartswith(token, "+CLCC: ")) { } else if (spa_strstartswith(token, "+CLCC: ")) {
struct spa_bt_telephony_call *call; struct spa_bt_telephony_call *call;
size_t pos;
char *token_end;
int idx; int idx;
unsigned int status, mpty; unsigned int status, mpty;
bool found = false; bool parsed = false, found = false;
token[strcspn(token, "\r")] = 0; token[strcspn(token, "\r")] = 0;
token[strcspn(token, "\n")] = 0; token[strcspn(token, "\n")] = 0;
token_end = token + strlen(token);
token += strlen("+CLCC: "); token += strlen("+CLCC: ");
token[strcspn(token, ",")] = 0;
idx = atoi(token); if (token < token_end) {
token += strcspn(token, "\0") + 1; pos = strcspn(token, ",");
// Skip direction token[pos] = '\0';
token[strcspn(token, ",")] = 0; idx = atoi(token);
token += strcspn(token, "\0") + 1; token += pos + 1;
token[strcspn(token, ",")] = 0; }
status = atoi(token); if (token < token_end) {
token += strcspn(token, "\0") + 1; // Skip direction
// Skip mode pos = strcspn(token, ",");
token[strcspn(token, ",")] = 0; token += pos + 1;
token += strcspn(token, "\0") + 1; }
token[strcspn(token, ",")] = 0; if (token < token_end) {
mpty = atoi(token); pos = strcspn(token, ",");
token += strcspn(token, "\0") + 1; token[pos] = '\0';
if (strlen(token) > 0) { status = atoi(token);
token += pos + 1;
}
if (token < token_end) {
// Skip mode
pos = strcspn(token, ",");
token += pos + 1;
}
if (token < token_end) {
pos = strcspn(token, ",");
token[pos] = '\0';
mpty = atoi(token);
token += pos + 1;
}
if (token < token_end) {
if (sscanf(token, "\"%16[^\"]\",%u", number, &type) != 2) { if (sscanf(token, "\"%16[^\"]\",%u", number, &type) != 2) {
spa_log_warn(backend->log, "Failed to parse number: %s", token); spa_log_warn(backend->log, "Failed to parse number: %s", token);
number[0] = '\0'; number[0] = '\0';
} }
parsed = true;
} }
spa_list_for_each(call, &rfcomm->telephony_ag->call_list, link) { if (SPA_LIKELY (parsed)) {
if (call->id == idx) { spa_list_for_each(call, &rfcomm->telephony_ag->call_list, link) {
bool changed = false; if (call->id == idx) {
bool changed = false;
found = true; found = true;
if (call->state != status) { if (call->state != status) {
call->state =status; call->state =status;
changed = true; changed = true;
} }
if (call->multiparty != mpty) { if (call->multiparty != mpty) {
call->multiparty = mpty; call->multiparty = mpty;
changed = true; changed = true;
} }
if (strlen(number) && !spa_streq(number, call->line_identification)) { if (strlen(number) && !spa_streq(number, call->line_identification)) {
if (call->line_identification) if (call->line_identification)
free(call->line_identification); free(call->line_identification);
call->line_identification = strdup(number); call->line_identification = strdup(number);
changed = true; changed = true;
} }
if (changed) if (changed)
telephony_call_notify_updated_props(call); telephony_call_notify_updated_props(call);
}
} }
}
if (!found) { if (!found) {
spa_log_info(backend->log, "New call, initial state: %u", status); spa_log_info(backend->log, "New call, initial state: %u", status);
call = hfp_hf_add_call(rfcomm, rfcomm->telephony_ag, status, strlen(number) ? number : NULL); call = hfp_hf_add_call(rfcomm, rfcomm->telephony_ag, status, strlen(number) ? number : NULL);
if (call == NULL) if (call == NULL)
spa_log_warn(backend->log, "failed to create call"); spa_log_warn(backend->log, "failed to create call");
else if (call->id != idx) else if (call->id != idx)
spa_log_warn(backend->log, "wrong call index: %d, expected: %d", call->id, idx); spa_log_warn(backend->log, "wrong call index: %d, expected: %d", call->id, idx);
}
} else {
spa_log_warn(backend->log, "malformed +CLCC command received from AG");
} }
rfcomm->hfp_hf_in_progress = false; rfcomm->hfp_hf_in_progress = false;