commit a00ef46c361062a82999f2ebda1a6dbe566029a8
author Vidyakumar Athota <vathota@codeaurora.org> Tue Aug 08 12:52:39 2017 -0700
committer Garmond Leung <garmondl@codeaurora.org> Wed Sep 13 16:14:27 2017 -0700
tree ddc9b9f01bf3d1add626946c47f88fb0c6ef6496
parent c4625f3391535fa8f6a4bf6b230f08eb13b17a5c

hal: return error if QAF session/stream is NULL

To stop the playback and handle appropriately, return error
to application if QAF session/stream is NULL.

Change-Id: I7ca7055e029e07c7a430f3d75bb0b3b12bd972e7

hal/audio_extn/qaf.c

diff --git a/hal/audio_extn/qaf.c b/hal/audio_extn/qaf.c
index e7ab846..a44d3d6 100644
--- a/hal/audio_extn/qaf.c
+++ b/hal/audio_extn/qaf.c
@@ -1919,13 +1919,16 @@
     struct qaf_module* qaf_mod = NULL;
     DEBUG_MSG("Flags 0x%x, Device 0x%x", flags, devices);
 
-    if (mmtype >= MAX_MM_MODULE_TYPE
-        || p_qaf->qaf_mod[mmtype].qaf_audio_session_open == NULL
-        || p_qaf->qaf_mod[mmtype].qaf_audio_stream_open == NULL) {
+    if (mmtype >= MAX_MM_MODULE_TYPE) {
         ERROR_MSG("Unsupported Stream");
         return -ENOTSUP;
     }
 
+    if (p_qaf->qaf_mod[mmtype].qaf_audio_session_open == NULL ||
+        p_qaf->qaf_mod[mmtype].qaf_audio_stream_open == NULL) {
+        ERROR_MSG("Session or Stream is NULL");
+        return status;
+    }
     //Open the module session, if not opened already.
     status = audio_extn_qaf_session_open(mmtype, out);
     qaf_mod = &(p_qaf->qaf_mod[mmtype]);