Skip to content

Fix segfaults on timeout and invalid audio unit index #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aditpape wants to merge 2 commits into
base: staging
Choose a base branch
from
Open

Fix segfaults on timeout and invalid audio unit index #382

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ecfa4b
cmd show connections: avoid SEGFAULT on cmd timeout
aditpape Sep 26, 2017
efd0ebf
cmd get/set sampling rate: handle invalid AUDIO_UNIT index
aditpape Sep 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions controller/app/cmdline/src/cmd_line.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3097,7 +3097,7 @@ int cmd_line::cmd_show_connections(int total_matched, std::vector<cli_argument *
{
avdecc_lib::stream_input_descriptor * instream = in_descriptor->get_stream_input_desc_by_index(in_stream_index);
avdecc_lib::stream_input_get_rx_state_response * stream_input_resp_ref = instream->get_stream_input_get_rx_state_response();
if (!stream_input_resp_ref->get_rx_state_connection_count())
if (!stream_input_resp_ref || !stream_input_resp_ref->get_rx_state_connection_count())
{
delete stream_input_resp_ref;
continue;
Expand All @@ -3118,7 +3118,8 @@ int cmd_line::cmd_show_connections(int total_matched, std::vector<cli_argument *
avdecc_lib::stream_input_get_rx_state_response * stream_input_resp_ref = instream->get_stream_input_get_rx_state_response();
avdecc_lib::stream_output_descriptor * outstream = out_descriptor->get_stream_output_desc_by_index(out_stream_index);
avdecc_lib::stream_output_get_tx_state_response * stream_output_resp_ref = outstream->get_stream_output_get_tx_state_response();
if (!stream_output_resp_ref->get_tx_state_connection_count() ||
if (!stream_output_resp_ref || !stream_input_resp_ref ||
!stream_output_resp_ref->get_tx_state_connection_count() ||
(stream_input_resp_ref->get_rx_state_stream_id() != stream_output_resp_ref->get_tx_state_stream_id()))
{
delete stream_input_resp_ref;
Expand Down Expand Up @@ -4495,9 +4496,12 @@ int cmd_line::cmd_set_sampling_rate(int total_matched, std::vector<cli_argument

if (desc_type_value == avdecc_lib::AEM_DESC_AUDIO_UNIT)
{
avdecc_lib::audio_unit_descriptor * audio_unit_desc_ref = configuration->get_audio_unit_desc_by_index(desc_index);
if (!audio_unit_desc_ref)
return 0;
intptr_t cmd_notification_id = get_next_notification_id();
sys->set_wait_for_next_cmd((void *)cmd_notification_id);
avdecc_lib::audio_unit_descriptor * audio_unit_desc_ref = configuration->get_audio_unit_desc_by_index(desc_index);

audio_unit_desc_ref->send_set_sampling_rate_cmd((void *)cmd_notification_id, new_sampling_rate);
int status = sys->get_last_resp_status();

Expand Down Expand Up @@ -4541,9 +4545,12 @@ int cmd_line::cmd_get_sampling_rate(int total_matched, std::vector<cli_argument

if (desc_type_value == avdecc_lib::AEM_DESC_AUDIO_UNIT)
{
avdecc_lib::audio_unit_descriptor * audio_unit_desc_ref = configuration->get_audio_unit_desc_by_index(desc_index);
if (!audio_unit_desc_ref)
return 0;
intptr_t cmd_notification_id = get_next_notification_id();
sys->set_wait_for_next_cmd((void *)cmd_notification_id);
avdecc_lib::audio_unit_descriptor * audio_unit_desc_ref = configuration->get_audio_unit_desc_by_index(desc_index);

audio_unit_desc_ref->send_get_sampling_rate_cmd((void *)cmd_notification_id);
int status = sys->get_last_resp_status();

Expand Down