[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 5fe466316aaac24447c342a0923816b30fd05e6c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 4 00:21:53 2004 +0000

    	Add extra sanity check to Image parameter of drawImage...
    
            Reviewed by Hyatt.
    
            * khtml/ecma/kjs_html.cpp:
            (KJS::Context2DFunction::tryCall):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6757 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d742037..8ad6698 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-06-03  Richard Williamson   <rjw at apple.com>
+
+	Add extra sanity check to Image parameter of drawImage...
+
+        Reviewed by Hyatt.
+
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::Context2DFunction::tryCall):
+
 2004-06-02  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3673931, negative margins on objects that dodge floats not handled correctly.
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index c277558..721a197 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -3872,7 +3872,7 @@ Value KJS::Context2DFunction::tryCall(ExecState *exec, Object &thisObj, const Li
                 return err;
             }
             ObjectImp *o = static_cast<ObjectImp*>(args[0].imp());
-            if (!o->inherits(&Image::info)) {
+            if (o->type() != ObjectType || !o->inherits(&Image::info)) {
                 Object err = Error::create(exec,TypeError);
                 exec->setException(err);
                 return err;
@@ -3900,7 +3900,7 @@ Value KJS::Context2DFunction::tryCall(ExecState *exec, Object &thisObj, const Li
                 return err;
             }
             ObjectImp *o = static_cast<ObjectImp*>(args[0].imp());
-            if (!o->inherits(&Image::info)) {
+            if (o->type() != ObjectType || !o->inherits(&Image::info)) {
                 Object err = Error::create(exec,TypeError);
                 exec->setException(err);
                 return err;

-- 
WebKit Debian packaging