Changeset 24559 in webkit

Timestamp:

Jul 23, 2007 8:01:26 PM (17 years ago)

Author:

andersca

Message:

Reviewed by Geoff.

<rdar://problem/5121461> REGRESSION: Unable to load JigZone puzzle

• bindings/jni/jni_jsobject.cpp: (JavaJSObject::createNative):

Call RootObject::gcProtect on the global object, thereby putting it in the
"protect count" set which is used for checking if a native handle is valid.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/jni/jni_jsobject.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-07-23  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Geoff.
+
+        <rdar://problem/5121461> REGRESSION: Unable to load JigZone puzzle
+        
+        * bindings/jni/jni_jsobject.cpp:
+        (JavaJSObject::createNative):
+        
+        Call RootObject::gcProtect on the global object, thereby putting it in the
+        "protect count" set which is used for checking if a native handle is valid.
+        
 2007-07-23  Darin Adler  <darin@apple.com>
 

trunk/JavaScriptCore/bindings/jni/jni_jsobject.cpp

@@ -338 +338 @@
     // otherwise we are being called after creating a JavaJSObject in
     // JavaJSObject::convertValueToJObject().
-    if (rootObject)
-        return ptr_to_jlong(rootObject->interpreter()->globalObject());
-
+    if (rootObject) {
+        JSObject* globalObject = rootObject->interpreter()->globalObject();
+        // We call gcProtect here to get the object into the root object's "protect set" which
+        // is used to test if a native handle is valid as well as getting the root object given the handle.
+        rootObject->gcProtect(globalObject);
+        return ptr_to_jlong(globalObject);
+    }
+    
     return nativeHandle;
 }