commit 9f56667ec50dc0127d2a7021095c7c1cf2ff997c
author Satya Krishna Pindiproli <satyak@codeaurora.org> Tue Feb 28 11:14:01 2017 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 10 03:44:28 2017 -0700
tree 538250d19845f99c9638e131d3605a2357c430d9
parent 29b894e8c465802d2343f2e5956df47a90a56eb6

hal: add NULL check for stream in

Add a null check for stream in to avoid crashes during
voice call recording and other use cases which involve
capture path.

CRs-Fixed: 2010691
Change-Id: Ifc23bb837804d9500a1b9c5164f79fa085b20a34

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index f887904..d18ab88 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -5494,9 +5494,9 @@
         /* update cfg against other existing capture usecases on same backend */
         list_for_each(node, &adev->usecase_list) {
             uc = node_to_item(node, struct audio_usecase, list);
-            if (uc->type == PCM_CAPTURE &&
+            in = (struct stream_in *) uc->stream.in;
+            if (in != NULL && uc->type == PCM_CAPTURE &&
                 backend_idx == platform_get_backend_index(uc->in_snd_device)) {
-                in = (struct stream_in *) uc->stream.in;
                 uc_channels = audio_channel_count_from_in_mask(in->channel_mask);
 
                 ALOGV("%s:txbecf: uc %s, id %d, sr %d, bw %d, ch %d, device %s",

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 93b28ca..22ce6ba 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -5360,9 +5360,9 @@
         /* update cfg against other existing capture usecases on same backend */
         list_for_each(node, &adev->usecase_list) {
             uc = node_to_item(node, struct audio_usecase, list);
-            if (uc->type == PCM_CAPTURE &&
+            in = (struct stream_in *) uc->stream.in;
+            if (in != NULL && uc->type == PCM_CAPTURE &&
                 backend_idx == platform_get_backend_index(uc->in_snd_device)) {
-                in = (struct stream_in *) uc->stream.in;
                 uc_channels = audio_channel_count_from_in_mask(in->channel_mask);
 
                 ALOGV("%s:txbecf: uc %s, id %d, sr %d, bw %d, ch %d, device %s",