Ver Fonte

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
Weiyi Wang há 7 anos atrás
pai
commit
12c365b549
1 ficheiros alterados com 2 adições e 1 exclusões
  1. 2 1
      src/audio_core/cubeb_sink.cpp

+ 2 - 1
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 collection_end{collection.device + collection.count};
             const auto device{
             const auto device{
                 std::find_if(collection.device, collection_end, [&](const cubeb_device_info& info) {
                 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) {
             if (device != collection_end) {
                 output_device = device->devid;
                 output_device = device->devid;