[webkit-changes] cvs commit: WebCore/khtml/ecma kjs_events.cpp

[Darin]

darin       05/10/24 19:54:06

  Modified:    .        ChangeLog
               khtml/ecma kjs_events.cpp
  Log:
          Reviewed by Hyatt.
  
          - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5054
            Crash with dataTransfer.setDragImage
  
          * khtml/ecma/kjs_events.cpp: (KJS::ClipboardProtoFunc::callAsFunction):
          Added type check in case the parameter passed is not an object.
  
  Revision  Changes    Path
  1.280     +10 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.279
  retrieving revision 1.280
  diff -u -r1.279 -r1.280
  --- ChangeLog	25 Oct 2005 00:07:41 -0000	1.279
  +++ ChangeLog	25 Oct 2005 02:54:03 -0000	1.280
  @@ -1,5 +1,15 @@
   2005-10-24  Darin Adler  <darin at apple.com>
   
  +        Reviewed by Hyatt.
  +
  +        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5054
  +          Crash with dataTransfer.setDragImage
  +
  +        * khtml/ecma/kjs_events.cpp: (KJS::ClipboardProtoFunc::callAsFunction):
  +        Added type check in case the parameter passed is not an object.
  +
  +2005-10-24  Darin Adler  <darin at apple.com>
  +
           Reviewed by Beth.
   
           - got ready to make m_parent private by removing references to it
  
  
  
  1.67      +1 -1      WebCore/khtml/ecma/kjs_events.cpp
  
  Index: kjs_events.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/kjs_events.cpp,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- kjs_events.cpp	16 Oct 2005 03:36:04 -0000	1.66
  +++ kjs_events.cpp	25 Oct 2005 02:54:06 -0000	1.67
  @@ -1250,7 +1250,7 @@
   
               // See if they passed us an Image object
               ObjectImp *o = static_cast<ObjectImp*>(args[0]);
  -            if (o->inherits(&Image::info)) {
  +            if (o->isObject() && o->inherits(&Image::info)) {
                   Image *JSImage = static_cast<Image*>(o);
                   cb->clipboard->setDragImage(JSImage->image()->pixmap(), QPoint(x,y));                
                   return Undefined();