patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Bluetooth: Audio: Ensure strtoX correctness in media_controller.c

Browse source 
Verify all values returned by calls to strtoX and convert
to the shell_strtoX functions.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2023-01-27 17:09:46 +01:00 committed by Carles Cufí
parent f0ea061b3a
commit 1bf9aae455
1 changed files with 46 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
subsys/bluetooth/shell/media_controller.c
View file

@ -566,11 +566,23 @@ static int cmd_media_read_track_position(const struct shell *sh, size_t argc, ch
static int cmd_media_set_track_position(const struct shell *sh, size_t argc,
char *argv[])
{
/* Todo: Check input "pos" for validity, or for errors in conversion? */
int32_t position = strtol(argv[1], NULL, 0);
long position;
int err = 0;
int err = media_proxy_ctrl_set_track_position(current_player, position);
position = shell_strtol(argv[1], 0, &err);
if (err != 0) {
shell_error(sh, "Could not parse position: %d", err);
return -ENOEXEC;
}
if (!IN_RANGE(position, INT32_MIN, INT32_MAX)) {
shell_error(sh, "Invalid position: %ld", position);
return -ENOEXEC;
}
err = media_proxy_ctrl_set_track_position(current_player, position);
if (err) {
shell_error(ctx_shell, "Track position set failed (%d)", err);
}
@ -592,9 +604,23 @@ static int cmd_media_read_playback_speed(const struct shell *sh, size_t argc, ch
static int cmd_media_set_playback_speed(const struct shell *sh, size_t argc, char *argv[])
{
int8_t speed = strtol(argv[1], NULL, 0);
int err = media_proxy_ctrl_set_playback_speed(current_player, speed);
long speed;
int err = 0;
speed = shell_strtol(argv[1], 0, &err);
if (err != 0) {
shell_error(sh, "Could not parse speed: %d", err);
return -ENOEXEC;
}
if (!IN_RANGE(speed, INT8_MIN, INT8_MAX)) {
shell_error(sh, "Invalid speed: %ld", speed);
return -ENOEXEC;
}
err = media_proxy_ctrl_set_playback_speed(current_player, speed);
if (err) {
shell_error(ctx_shell, "Playback speed set failed (%d)", err);
}
@ -686,10 +712,23 @@ static int cmd_media_read_playing_order(const struct shell *sh, size_t argc, cha
static int cmd_media_set_playing_order(const struct shell *sh, size_t argc, char *argv[])
{
uint8_t order = strtol(argv[1], NULL, 0);
unsigned long order;
int err = 0;
int err = media_proxy_ctrl_set_playing_order(current_player, order);
order = shell_strtoul(argv[1], 0, &err);
if (err != 0) {
shell_error(sh, "Could not parse order: %d", err);
return -ENOEXEC;
}
if (order > UINT8_MAX) {
shell_error(sh, "Invalid order: %ld", order);
return -ENOEXEC;
}
err = media_proxy_ctrl_set_playing_order(current_player, order);
if (err) {
shell_error(ctx_shell, "Playing order set failed (%d)", err);
}