From 12c365b54959207ec1ae186b8110fcc15e561267 Mon Sep 17 00:00:00 2001
From: Weiyi Wang <wwylele@gmail.com>
Date: Fri, 26 Oct 2018 00:32:41 -0400
Subject: [PATCH] cubeb_sink: ignore null-name device when selecting
We already ignore them on listing devices. We should do the same when selecting devices. This fix a crash when opening a specific device while there is a null device in the list
---
src/audio_core/cubeb_sink.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/audio_core/cubeb_sink.cpp b/src/audio_core/cubeb_sink.cpp
index 3920396880..d31a1c8442 100644
--- a/src/audio_core/cubeb_sink.cpp
+++ b/src/audio_core/cubeb_sink.cpp
@@ -121,7 +121,8 @@ CubebSink::CubebSink(std::string target_device_name) {
const auto collection_end{collection.device + collection.count};
const auto device{
std::find_if(collection.device, collection_end, [&](const cubeb_device_info& info) {
- return target_device_name == info.friendly_name;
+ return info.friendly_name != nullptr &&
+ target_device_name == info.friendly_name;
})};
if (device != collection_end) {
output_device = device->devid;