[webkit-changes] cvs commit: WebCore/khtml/html html_imageimpl.cpp

[Maciej]

mjs         05/10/05 21:13:13

  Modified:    .        ChangeLog
               khtml/html html_imageimpl.cpp
  Log:
          Reviewed by Eric.
  
  	<rdar://problem/4150976> Safari crashes in HTMLImageLoader::dispatchLoadEvent() on particular page (archive attached)
  
  	I couldn't figure out how to make an automated test for this; even once I got DumpRenderTree
  	to mouse in and out it did not crash.
  
          * khtml/html/html_imageimpl.cpp:
          (HTMLImageLoader::dispatchLoadEvent): Check if CachedImage is null before using it.
  
  Revision  Changes    Path
  1.205     +12 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.204
  retrieving revision 1.205
  diff -u -r1.204 -r1.205
  --- ChangeLog	6 Oct 2005 00:53:52 -0000	1.204
  +++ ChangeLog	6 Oct 2005 04:13:10 -0000	1.205
  @@ -1,3 +1,15 @@
  +2005-10-05  Maciej Stachowiak  <mjs at apple.com>
  +
  +        Reviewed by Eric.
  +
  +	<rdar://problem/4150976> Safari crashes in HTMLImageLoader::dispatchLoadEvent() on particular page (archive attached)
  +
  +	I couldn't figure out how to make an automated test for this; even once I got DumpRenderTree
  +	to mouse in and out it did not crash.
  +	
  +        * khtml/html/html_imageimpl.cpp:
  +        (HTMLImageLoader::dispatchLoadEvent): Check if CachedImage is null before using it.
  +
   2005-10-05  David Harrison  <harrison at apple.com>
   
           Reviewed by Darin.
  
  
  
  1.53      +1 -1      WebCore/khtml/html/html_imageimpl.cpp
  
  Index: html_imageimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_imageimpl.cpp,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- html_imageimpl.cpp	3 Oct 2005 21:12:29 -0000	1.52
  +++ html_imageimpl.cpp	6 Oct 2005 04:13:12 -0000	1.53
  @@ -111,7 +111,7 @@
   
   void HTMLImageLoader::dispatchLoadEvent()
   {
  -    if (!m_firedLoad) {
  +    if (!m_firedLoad && m_image) {
           m_firedLoad = true;
           if (m_image->isErrorImage())
               element()->dispatchHTMLEvent(errorEvent, false, false);