Avoid leaking JNI local references in UrlInterceptResponse

Bug: 4509854 Change-Id: I70bd6b5f1ce32263b1f048a7bb5e732338e7297d
aosp-mirror · Jul 6, 2011 · 1e3e46a · 1e3e46a · LOG-TAG · Jun 26, 2012
1 parent 63cbafa
commit 1e3e46a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Source/WebKit/android/WebCoreSupport/UrlInterceptResponse.cpp b/Source/WebKit/android/WebCoreSupport/UrlInterceptResponse.cpp
@@ -46,6 +46,7 @@ class JavaInputStreamWrapper {
         LOG_ALWAYS_FATAL_IF(!m_read);
         m_close = env->GetMethodID(inputStreamClass, "close", "()V");
         LOG_ALWAYS_FATAL_IF(!m_close);
+        env->DeleteLocalRef(inputStreamClass);
     }
 
     ~JavaInputStreamWrapper() {
@@ -112,6 +113,7 @@ UrlInterceptResponse::UrlInterceptResponse(JNIEnv* env, jobject response) {
     }
 
     env->DeleteLocalRef(javaResponse);
+    env->DeleteLocalRef(stream);
     env->DeleteLocalRef(mimeStr);
     env->DeleteLocalRef(encodingStr);
 }

diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -525,7 +525,9 @@ WebFrame::shouldInterceptRequest(const WTF::String& url)
     env->DeleteLocalRef(urlStr);
     if (response == 0)
         return 0;
-    return new UrlInterceptResponse(env, response);
+    UrlInterceptResponse* result = new UrlInterceptResponse(env, response);
+    env->DeleteLocalRef(response);
+    return result;
 }
 
 void