From 9f4cc242f031f8659a171bba32a475c9545a0d77 Mon Sep 17 00:00:00 2001 From: krukai Date: Sat, 27 Jun 2020 17:01:58 +0200 Subject: Safely iterate over card profile info array --- src/mainwindow.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/mainwindow.cc b/src/mainwindow.cc index 83e4964..e3e25ca 100644 --- a/src/mainwindow.cc +++ b/src/mainwindow.cc @@ -209,7 +209,7 @@ void MainWindow::updateCard(const pa_card_info &info) { w->hasSinks = w->hasSources = false; profile_priorities.clear(); - for (pa_card_profile_info2 ** p_profile = info.profiles2; *p_profile != nullptr; ++p_profile) { + for (pa_card_profile_info2 ** p_profile = info.profiles2; p_profile && *p_profile != nullptr; ++p_profile) { w->hasSinks = w->hasSinks || ((*p_profile)->n_sinks > 0); w->hasSources = w->hasSources || ((*p_profile)->n_sources > 0); profile_priorities.insert(*p_profile); @@ -225,7 +225,7 @@ void MainWindow::updateCard(const pa_card_info &info) { p.available = info.ports[i]->available; p.direction = info.ports[i]->direction; p.latency_offset = info.ports[i]->latency_offset; - for (pa_card_profile_info2 ** p_profile = info.ports[i]->profiles2; *p_profile != nullptr; ++p_profile) + for (pa_card_profile_info2 ** p_profile = info.ports[i]->profiles2; p_profile && *p_profile != nullptr; ++p_profile) p.profiles.push_back((*p_profile)->name); w->ports[p.name] = p; -- cgit v1.2.3-55-g7522