commit 3c8fbaef40819b3e644dccf8d0bde767fe07be8d
author Leena Winterrowd <lenhardw@codeaurora.org> Tue Jan 12 15:05:53 2016 -0800
committer Naresh Tanniru <ntanniru@codeaurora.org> Fri Jan 22 18:26:06 2016 +0530
tree 4eb81c6efdfdbd0d0f065d535efff77fcf743914
parent 61f9adf9fa0e709ecc6e5c42a185fe0a155c4a9a

hal: Validate active input before accessing source

- Ensure that the audio device's active input is valid before
  attempting to access the input source.

CRs-Fixed: 959009
Change-Id: If66cc1e3d5467bf7d03137fdbbffd724a57ecaf6

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index c46f419..8c729ff 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
  * Not a Contribution.
  *
  * Copyright (C) 2013 The Android Open Source Project
@@ -1000,7 +1000,8 @@
             out_snd_device = SND_DEVICE_NONE;
             if (in_snd_device == SND_DEVICE_NONE) {
                 audio_devices_t out_device = AUDIO_DEVICE_NONE;
-                if ((adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION ||
+                if (adev->active_input &&
+                    (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION ||
                     (adev->mode == AUDIO_MODE_IN_COMMUNICATION &&
                      adev->active_input->source == AUDIO_SOURCE_MIC)) &&
                      adev->primary_output && !adev->primary_output->standby) {