From dfed9a3f13ada3cbf6aa7123649c702f1ad1c566 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 19 Dec 2016 20:17:32 +0100 Subject: [PATCH] Fix nullptr access in mixer group. This was only ever an issue on booboot and not in flight. --- src/modules/systemlib/mixer/mixer_group.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/modules/systemlib/mixer/mixer_group.cpp b/src/modules/systemlib/mixer/mixer_group.cpp index ba7d6d1b93..a3ad2121d3 100644 --- a/src/modules/systemlib/mixer/mixer_group.cpp +++ b/src/modules/systemlib/mixer/mixer_group.cpp @@ -157,7 +157,14 @@ uint16_t MixerGroup::get_saturation_status() { Mixer *mixer = _first; - return mixer->get_saturation_status(); + uint16_t sat = 0; + + while (mixer != nullptr) { + sat |= mixer->get_saturation_status(); + mixer = mixer->_next; + } + + return sat; } unsigned @@ -166,7 +173,7 @@ MixerGroup::count() Mixer *mixer = _first; unsigned index = 0; - while ((mixer != nullptr)) { + while (mixer != nullptr) { mixer = mixer->_next; index++; }