commit 5915fa32fb6ec38b90a57162bf72c3ef714f03d7
author Kevin Rocard <krocard@google.com> Thu Mar 29 10:32:44 2018 -0700
committer Kevin Rocard <krocard@google.com> Thu Mar 29 17:37:46 2018 +0000
tree eca91a7b08cc3305954a17a6751bb5708819c9de
parent 0c2e7237654f1e92a97583ecc7838d3a92997624

libaudiohal: Fix dereference before NULL check

deviceAddressFromHal was checking the wrong pointer before dereferencing.

Test: compile
Bug: 77263416
Change-Id: Ic47af7085dd88f451ae81034b84444719f68cfc5
Signed-off-by: Kevin Rocard <krocard@google.com>

media/libaudiohal/4.0/DeviceHalHidl.cpp

diff --git a/media/libaudiohal/4.0/DeviceHalHidl.cpp b/media/libaudiohal/4.0/DeviceHalHidl.cpp
index 8da1051..1f33b97 100644
--- a/media/libaudiohal/4.0/DeviceHalHidl.cpp
+++ b/media/libaudiohal/4.0/DeviceHalHidl.cpp
@@ -59,7 +59,7 @@
         audio_devices_t device, const char* halAddress, DeviceAddress* address) {
     address->device = AudioDevice(device);
 
-    if (address == nullptr || strnlen(halAddress, AUDIO_DEVICE_MAX_ADDRESS_LEN) == 0) {
+    if (halAddress == nullptr || strnlen(halAddress, AUDIO_DEVICE_MAX_ADDRESS_LEN) == 0) {
         return OK;
     }
     const bool isInput = (device & AUDIO_DEVICE_BIT_IN) != 0;