[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:16:30 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 33cd366600a3ed4fce611fc02139c71c8244ba55
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 5 22:00:06 2003 +0000

    	Fixed 3501885.  Added null test to returned node from collection.
    
            Reviewed by John.
    
            * khtml/ecma/kjs_html.cpp:
            (KJS::HTMLCollection::tryGet):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5708 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6e6b646..5cd7bce 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-12-05  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3501885.  Added null test to returned node from collection.
+
+        Reviewed by John.
+
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLCollection::tryGet):
+
 2003-12-04  Richard Williamson   <rjw at apple.com>
 
 	Added support for named applet access from document node.
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index dce7bc2..b6b2740 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -2910,7 +2910,7 @@ Value KJS::HTMLCollection::tryGet(ExecState *exec, const Identifier &propertyNam
       DOM::Node node = collection.item(u);
 
 #if APPLE_CHANGES
-        if (node.handle()->id() == ID_APPLET) {
+        if (!node.isNull() && node.handle()->id() == ID_APPLET) {
             return getRuntimeObject(exec,node);
         }
 #endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list