From f8c70c9c3412409f60587c991e8122b438b9fd61 Mon Sep 17 00:00:00 2001
From: Youfa <vsyfar@gmail.com>
Date: Sun, 17 Sep 2023 16:23:31 +0800
Subject: [PATCH] fix: Handle out-of-range device index after GetDevicesInfo

When the specified device was not found in GetDevicesInfo,
SetPlayoutDevice/SetRecordingDevice will never return a (-1) error.

Bug: None
Change-Id: I9ac71cf72f7876c1c54ee593f184aa4007dba22f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/320500
Commit-Queue: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40768}
---
 AUTHORS                                               | 1 +
 modules/audio_device/linux/audio_device_alsa_linux.cc | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f4b6f8d65c..6e922401d0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -133,6 +133,7 @@ Xiaohong Xu <freemine@yeah.net>
 Xiaolei Yu <dreifachstein@gmail.com>
 Xinchao Tian <tianxinchao@360.cn>
 Yaowen Guo <albertguo88@gmail.com>
+Youfa <vsyfar@gmail.com>
 Yura Yaroshevich <yura.yaroshevich@gmail.com>
 Yuriy Pavlyshak <yuriy@appear.in>
 Yusuke Suzuki <utatane.tea@gmail.com>
diff --git a/modules/audio_device/linux/audio_device_alsa_linux.cc b/modules/audio_device/linux/audio_device_alsa_linux.cc
index eab73737c5..1e0ac8be28 100644
--- a/modules/audio_device/linux/audio_device_alsa_linux.cc
+++ b/modules/audio_device/linux/audio_device_alsa_linux.cc
@@ -588,7 +588,7 @@ int32_t AudioDeviceLinuxALSA::SetPlayoutDevice(uint16_t index) {
     return -1;
   }
 
-  uint32_t nDevices = GetDevicesInfo(0, true);
+  int32_t nDevices = GetDevicesInfo(0, true);
   RTC_LOG(LS_VERBOSE) << "number of available audio output devices is "
                       << nDevices;
 
@@ -657,7 +657,7 @@ int32_t AudioDeviceLinuxALSA::SetRecordingDevice(uint16_t index) {
     return -1;
   }
 
-  uint32_t nDevices = GetDevicesInfo(0, false);
+  int32_t nDevices = GetDevicesInfo(0, false);
   RTC_LOG(LS_VERBOSE) << "number of availiable audio input devices is "
                       << nDevices;