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

rjw rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:47:50 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 7c71a32a666c218236c37741c5f012faf5acb719
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 19 01:41:24 2004 +0000

    	Fixed <rdar://problem/3702287> Crash returning nil from bound ObjC
    
    	This turned out to be a show stopper for Dashboard.  Accessing a nil
    	ObjC property from JS caused a crash.  Similar to the problem
    	3696112 fixed below.
    
            Reviewed by Trey.
    
            * bindings/objc/objc_runtime.mm:
            (KJS::Bindings::ObjcField::valueFromInstance):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6892 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 698ccb0..827fb83 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2004-06-16  Richard Williamson   <rjw at apple.com>
+
+	Fixed <rdar://problem/3702287> Crash returning nil from bound ObjC
+
+	This turned out to be a show stopper for Dashboard.  Accessing a nil
+	ObjC property from JS caused a crash.  Similar to the problem
+	3696112 fixed below.
+	
+        Reviewed by Trey.
+
+        * bindings/objc/objc_runtime.mm:
+        (KJS::Bindings::ObjcField::valueFromInstance):
+
 === Safari-146 ===
 
 2004-06-16  Richard Williamson   <rjw at apple.com>
diff --git a/JavaScriptCore/bindings/objc/objc_runtime.mm b/JavaScriptCore/bindings/objc/objc_runtime.mm
index 0ff4ce9..dae9d89 100644
--- a/JavaScriptCore/bindings/objc/objc_runtime.mm
+++ b/JavaScriptCore/bindings/objc/objc_runtime.mm
@@ -99,6 +99,8 @@ Value ObjcField::valueFromInstance(KJS::ExecState *exec, const Instance *instanc
 
     if (objcValue)
         aValue = convertObjcValueToValue (exec, &objcValue, ObjcObjectType);
+    else
+        aValue = Undefined();
 
     return aValue;
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list