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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit d348f79f0bbeef0fbfa8b9415e23b178b66351fe
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 19:40:45 2004 +0000

    	Fixed 3590169.  Regression (crash) caused by the switch to MethodLists.  Crash when attempting to invoke a method from JavaScript to Java that is not implemented.
    
            Reviewed by John.
    
            * bindings/jni/jni_class.cpp:
            (JavaClass::methodsNamed):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6231 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 75585ee..a133831 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-16  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3590169.  Regression (crash) caused by the switch to MethodLists.  Crash when attempting to invoke a method from JavaScript to Java that is not implemented.
+
+        Reviewed by John.
+
+        * bindings/jni/jni_class.cpp:
+        (JavaClass::methodsNamed):
+
 2004-03-15  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3570854.  Don't attempt to convert Null to strings.  We
diff --git a/JavaScriptCore/bindings/jni/jni_class.cpp b/JavaScriptCore/bindings/jni/jni_class.cpp
index 260eff7..4eef5b7 100644
--- a/JavaScriptCore/bindings/jni/jni_class.cpp
+++ b/JavaScriptCore/bindings/jni/jni_class.cpp
@@ -164,7 +164,9 @@ MethodList JavaClass::methodsNamed(const char *name) const
     CFStringRef methodName = CFStringCreateWithCString(NULL, name, kCFStringEncodingASCII);
     MethodList *methodList = (MethodList *)CFDictionaryGetValue(_methods, methodName);
     CFRelease (methodName);
-    return *methodList;
+    if (methodList)
+        return *methodList;
+    return MethodList();
 }
 
 

-- 
WebKit Debian packaging