Fix memory leak in WifiNativeandroid-m-preview-2

String created with GetStringUTFChars is not
released causing a memory leak.

Use ScopedUtfChars instead to ensure that memory is released.

GetByteArrayElements does not free allocated memory, call
ReleaseByteArrayElements to free up memory.

Change-Id: Ifd5330fa4cf190818319a7899de0cc5e2ccb2a53

1 files changed, 12 insertions, 10 deletions

diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index c14fa8dbd..927649bda 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -539,13 +539,13 @@ static bool parseMacAddress(JNIEnv *env, jobject obj, mac_addr addr) {
         return false;
     }
 
-    const char *bssid = env->GetStringUTFChars(macAddrString, NULL);
-    if (bssid == NULL) {
+    ScopedUtfChars bssid(env, macAddrString);
+    if (bssid.c_str() == NULL) {
         ALOGE("Error getting bssid");
         return false;
     }
 
-    parseMacAddress(bssid, addr);
+    parseMacAddress(bssid.c_str(), addr);
     return true;
 }
 
@@ -627,12 +627,12 @@ static jboolean android_net_wifi_setHotlist(
             return false;
         }
 
-        const char *bssid = env->GetStringUTFChars(macAddrString, NULL);
-        if (bssid == NULL) {
+        ScopedUtfChars bssid(env, macAddrString);
+        if (bssid.c_str() == NULL) {
             ALOGE("Error getting bssid");
             return false;
         }
-        parseMacAddress(bssid, params.ap[i].bssid);
+        parseMacAddress(bssid.c_str(), params.ap[i].bssid);
 
         mac_addr addr;
         memcpy(addr, params.ap[i].bssid, sizeof(mac_addr));
@@ -748,14 +748,14 @@ static jboolean android_net_wifi_trackSignificantWifiChange(
             return false;
         }
 
-        const char *bssid = env->GetStringUTFChars(macAddrString, NULL);
-        if (bssid == NULL) {
+        ScopedUtfChars bssid(env, macAddrString);
+        if (bssid.c_str() == NULL) {
             ALOGE("Error getting bssid");
             return false;
         }
 
         mac_addr addr;
-        parseMacAddress(bssid, addr);
+        parseMacAddress(bssid.c_str(), addr);
         memcpy(params.ap[i].bssid, addr, sizeof(mac_addr));
 
         char bssidOut[32];
@@ -1021,7 +1021,9 @@ static jboolean android_net_wifi_setScanningMacOui(JNIEnv *env, jclass cls,
         return false;
     }
 
-    return wifi_set_scanning_mac_oui(handle, (byte *)bytes) == WIFI_SUCCESS;
+    wifi_error ret = wifi_set_scanning_mac_oui(handle, (byte *)bytes);
+    env->ReleaseByteArrayElements(param, bytes, 0);
+    return ret == WIFI_SUCCESS;
 }
 
 static jintArray android_net_wifi_getValidChannels(JNIEnv *env, jclass cls,