Merge "hal: free pal_volume after use"

1 files changed, 39 insertions, 0 deletions

diff --git a/hal/audio_extn/Hfp.cpp b/hal/audio_extn/Hfp.cpp
index b63467cc..e7b93cdc 100644
--- a/hal/audio_extn/Hfp.cpp
+++ b/hal/audio_extn/Hfp.cpp
@@ -60,6 +60,41 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/*
+Changes from Qualcomm Innovation Center are provided under the following license:
+Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+	    * Redistributions of source code must retain the above copyright
+              notice, this list of conditions and the following disclaimer.
+
+	    * Redistributions in binary form must reproduce the above
+              copyright notice, this list of conditions and the following
+              disclaimer in the documentation and/or other materials provided
+              with the distribution.
+
+            * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
+	      contributors may be used to endorse or promote products derived
+              from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
 #define LOG_TAG "AHAL: hfp"
 #define LOG_NDDEBUG 0
 
@@ -192,9 +227,13 @@ static int hfp_set_mic_volume(float value)
     pal_volume->volume_pair[0].vol = value;
     if (pal_stream_set_volume(hfpmod.tx_stream_handle, pal_volume) < 0) {
         AHAL_ERR("Couldn't set HFP Volume: [%d]", volume);
+        free(pal_volume);
+        pal_volume = NULL;
         return -EINVAL;
     }
 
+    free(pal_volume);
+    pal_volume = NULL;
     hfpmod.mic_volume = value;
 
     return ret;