Merge branch 'yarp-3.8'

robotology · Sep 18, 2023 · c1d30be · c1d30be
2 parents e372b75 + 4670cb5
commit c1d30be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/doc/release/yarp_3_8/audioRecorderBase_fix.md b/doc/release/yarp_3_8/audioRecorderBase_fix.md
@@ -0,0 +1,6 @@
+audioRecorderBase_fix {#yarp-3.8}
+---
+
+### `lib_YARP_dev`
+
+* Fixed segfault in audioRecorderDeviceBase
diff --git a/src/libYARP_dev/src/yarp/dev/AudioRecorderDeviceBase.cpp b/src/libYARP_dev/src/yarp/dev/AudioRecorderDeviceBase.cpp
@@ -87,7 +87,7 @@ bool AudioRecorderDeviceBase::getSound(yarp::sig::Sound& sound, size_t min_numbe
     if (samples_to_be_copied > max_number_of_samples) {
         samples_to_be_copied = max_number_of_samples;
     }
-    if (sound.getChannels() != this->m_audiorecorder_cfg.numChannels && sound.getSamples() != samples_to_be_copied)
+    if (sound.getChannels() != this->m_audiorecorder_cfg.numChannels || sound.getSamples() != samples_to_be_copied)
     {
         sound.resize(samples_to_be_copied, this->m_audiorecorder_cfg.numChannels);
     }