[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 0d9f2ccf562bb777ea341901ef14828a0d94efc4
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 9 23:38:02 2003 +0000

            Reviewed by Maciej.
    
            * khtml/ecma/kjs_events.cpp: (JSEventListener::handleEvent): Add locking around the call to
            push event handler scope. Without this, we hit the "allocated without locking" assertion.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5733 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 57ec454..cfbdf2c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2003-12-09  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        * khtml/ecma/kjs_events.cpp: (JSEventListener::handleEvent): Add locking around the call to
+        push event handler scope. Without this, we hit the "allocated without locking" assertion.
+
 2003-12-09  David Hyatt  <hyatt at apple.com>
 
 	Fix the dirty rect checks on various render_objects to be more accurate so that page-break properties don't
diff --git a/WebCore/khtml/ecma/kjs_events.cpp b/WebCore/khtml/ecma/kjs_events.cpp
index 8f5944c..ed9997f 100644
--- a/WebCore/khtml/ecma/kjs_events.cpp
+++ b/WebCore/khtml/ecma/kjs_events.cpp
@@ -88,7 +88,9 @@ void JSEventListener::handleEvent(DOM::Event &evt, bool isWindowEvent)
         KJS::Interpreter::unlock();
         if ( !thisObj.isNull() ) {
             ScopeChain scope = oldScope;
+            KJS::Interpreter::lock();
             static_cast<DOMNode*>(thisObj.imp())->pushEventHandlerScope(exec, scope);
+            KJS::Interpreter::unlock();
             listener.setScope( scope );
         }
     }

-- 
WebKit Debian packaging