Changeset 92689 in webkit

Timestamp:

Aug 9, 2011 10:00:03 AM (13 years ago)

Author:

steveblock@google.com

Message:

Java Bridge leaks local references
​https://bugs.webkit.org/show_bug.cgi?id=64320

Reviewed by Alexey Proskuryakov.

No new tests as this is just an optimization.

• bridge/jni/jsc/JavaFieldJSC.cpp:

(JavaField::JavaField):

• bridge/jni/jsc/JavaMethodJSC.cpp:

(JavaMethod::JavaMethod):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/jni/jsc/JavaFieldJSC.cpp (modified) (3 diffs)
• bridge/jni/jsc/JavaMethodJSC.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-09  Steve Block  <steveblock@google.com>
+
+        Java Bridge leaks local references
+        https://bugs.webkit.org/show_bug.cgi?id=64320
+
+        Reviewed by Alexey Proskuryakov.
+
+        No new tests as this is just an optimization.
+
+        * bridge/jni/jsc/JavaFieldJSC.cpp:
+        (JavaField::JavaField):
+        * bridge/jni/jsc/JavaMethodJSC.cpp:
+        (JavaMethod::JavaMethod):
+
 2011-08-09  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/bridge/jni/jsc/JavaFieldJSC.cpp

@@ -45 +45 @@
     // Get field type name
     jstring fieldTypeName = 0;
-    if (jobject fieldType = callJNIMethod<jobject>(aField, "getType", "()Ljava/lang/Class;"))
+    jclass fieldType = static_cast<jclass>(callJNIMethod<jobject>(aField, "getType", "()Ljava/lang/Class;"));
+    if (fieldType)
         fieldTypeName = static_cast<jstring>(callJNIMethod<jobject>(fieldType, "getName", "()Ljava/lang/String;"));
     if (!fieldTypeName)
@@ -52 +53 @@
 
     m_type = javaTypeFromClassName(m_typeClassName.utf8());
+    env->DeleteLocalRef(fieldType);
+    env->DeleteLocalRef(fieldTypeName);
 
     // Get field name
@@ -58 +61 @@
         fieldName = env->NewStringUTF("<Unknown>");
     m_name = JavaString(env, fieldName);
+    env->DeleteLocalRef(fieldName);
 
     m_field = JobjectWrapper::create(aField);

trunk/Source/WebCore/bridge/jni/jsc/JavaMethodJSC.cpp

@@ -42 +42 @@
     jstring returnTypeName = 0;
     if (jobject returnType = callJNIMethod<jobject>(aMethod, "getReturnType", "()Ljava/lang/Class;")) {
-            returnTypeName = static_cast<jstring>(callJNIMethod<jobject>(returnType, "getName", "()Ljava/lang/String;"));
+        returnTypeName = static_cast<jstring>(callJNIMethod<jobject>(returnType, "getName", "()Ljava/lang/String;"));
         if (!returnTypeName)
             returnTypeName = env->NewStringUTF("<Unknown>");