From 4ce27b51ea88c4d5e445201e5b2dbbb5d2c34eac Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Tue, 5 Jun 2018 12:01:35 -0700
Subject: [PATCH] AudioRecord JNI: fix mem leak on audio_attributes_t

Free memory calloc'd to hold audio_attributes_t for the
  AudioRecord instance.

Bug: 109700675
Test: see bug
Change-Id: I688c6d2ee4a2db5a4d96b54e33bcc7237daef235
---
 core/jni/android_media_AudioRecord.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp
index 375d68b858240..1ea4ed1b17384 100644
--- a/core/jni/android_media_AudioRecord.cpp
+++ b/core/jni/android_media_AudioRecord.cpp
@@ -368,10 +368,19 @@ android_media_AudioRecord_setup(JNIEnv *env, jobject thiz, jobject weak_this,
     // of the Java object (in mNativeCallbackCookie) so we can free the memory in finalize()
     env->SetLongField(thiz, javaAudioRecordFields.nativeCallbackCookie, (jlong)lpCallbackData);
 
+    if (paa != NULL) {
+        // audio attributes were copied in AudioRecord creation
+        free(paa);
+        paa = NULL;
+    }
+
     return (jint) AUDIO_JAVA_SUCCESS;
 
     // failure:
 native_init_failure:
+    if (paa != NULL) {
+        free(paa);
+    }
     env->DeleteGlobalRef(lpCallbackData->audioRecord_class);
     env->DeleteGlobalRef(lpCallbackData->audioRecord_ref);
     delete lpCallbackData;