Changeset 9549 in webkit for trunk/JavaScriptCore/bindings/objc/WebScriptObject.mm

Timestamp:

Jun 30, 2005, 11:19:42 AM (20 years ago)

Author:

kdecker

Message:

Reviewed by rjw.

fixed: <rdar://problem/4166838> failed assertion in`Interpreter::lockCount() > 0

no layout test added; this is in the bindings code.

• bindings/objc/WebScriptObject.mm: (+[WebScriptObject _convertValueToObjcValue:KJS::originExecutionContext:Bindings::executionContext:Bindings::]): make sure to lock and unlock the interpreter around allocations.

File:

• trunk/JavaScriptCore/bindings/objc/WebScriptObject.mm (modified) (1 diff)

trunk/JavaScriptCore/bindings/objc/WebScriptObject.mm

@@ -422 +422 @@
         Interpreter *intepreter = executionContext->interpreter();
         ExecState *exec = intepreter->globalExec();
-
-        if (objectImp->classInfo() != &KJS::RuntimeObjectImp::info) {
+        Interpreter::lock();
+        
+        if (objectImp->classInfo() != &KJS::RuntimeObjectImp::info) {
             Value runtimeObject = objectImp->get(exec, "__apple_runtime_object");
             if (!runtimeObject.isNull() && runtimeObject.type() == KJS::ObjectType)
                 objectImp = static_cast<RuntimeObjectImp*>(runtimeObject.imp());
         }
+        
+        Interpreter::unlock();
 
         if (objectImp->classInfo() == &KJS::RuntimeObjectImp::info) {