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

bluez5: backend-native: fix off-by-one in at+xevent

Browse source
This commit is contained in:
Pauli Virtanen 2023-04-22 13:21:55 +03:00
parent 12bc69a469
commit f7b57d87d6
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -691,11 +691,11 @@ static void process_xevent_indicator(struct rfcomm *rfcomm, unsigned int level,
spa_log_debug(backend->log, "AT+XEVENT level:%u nlevels:%u", level, nlevels); spa_log_debug(backend->log, "AT+XEVENT level:%u nlevels:%u", level, nlevels);
if (nlevels == 0) if (nlevels <= 1)
return; return;
/* 0 <= level < nlevels; doesn't make much sense to report 0% so bump range up */ /* 0 <= level < nlevels */
perc = SPA_MIN(level + 1, nlevels) * 100 / nlevels; perc = SPA_MIN(level, nlevels - 1) * 100 / (nlevels - 1);
spa_bt_device_report_battery_level(rfcomm->device, perc); spa_bt_device_report_battery_level(rfcomm->device, perc);
} }
@ -1092,7 +1092,7 @@ next_indicator:
process_xevent_indicator(rfcomm, xevent_level, xevent_nlevels); process_xevent_indicator(rfcomm, xevent_level, xevent_nlevels);
rfcomm_send_reply(rfcomm, "OK"); rfcomm_send_reply(rfcomm, "OK");
} else if (sscanf(buf, "AT+XEVENT=BATTERY,%u", &xevent_level) == 1) { } else if (sscanf(buf, "AT+XEVENT=BATTERY,%u", &xevent_level) == 1) {
process_xevent_indicator(rfcomm, xevent_level, 10); process_xevent_indicator(rfcomm, xevent_level + 1, 11);
rfcomm_send_reply(rfcomm, "OK"); rfcomm_send_reply(rfcomm, "OK");
} else if (sscanf(buf, "AT+IPHONEACCEV=%u%n", &count, &r) == 1) { } else if (sscanf(buf, "AT+IPHONEACCEV=%u%n", &count, &r) == 1) {
if (count < 1 || count > 100) if (count < 1 || count > 100)