[webkit-changes] cvs commit: WebCore/khtml/misc loader.cpp

[Timothy]

thatcher    05/10/24 14:52:03

  Modified:    .        ChangeLog
               khtml/misc loader.cpp
  Log:
          Reviewed by Darin Adler.
          Commited by Tim Hatcher.
  
          - fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=5484
          REGRESSION: reproducible crash in CachedCSSStyleSheet::setCharset
  
          * khtml/misc/loader.cpp:
          (CachedCSSStyleSheet::setCharset):
          (CachedScript::setCharset):
  
  Revision  Changes    Path
  1.274     +12 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.273
  retrieving revision 1.274
  diff -u -r1.273 -r1.274
  --- ChangeLog	24 Oct 2005 21:42:09 -0000	1.273
  +++ ChangeLog	24 Oct 2005 21:51:54 -0000	1.274
  @@ -1,3 +1,15 @@
  +2005-10-24  Alexey Proskuryakov  <ap at nypop.com>
  +
  +        Reviewed by Darin Adler.
  +        Commited by Tim Hatcher.
  +
  +        - fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=5484
  +        REGRESSION: reproducible crash in CachedCSSStyleSheet::setCharset
  +
  +        * khtml/misc/loader.cpp:
  +        (CachedCSSStyleSheet::setCharset):
  +        (CachedScript::setCharset):
  +
   2005-10-24  Mitz Pettel  <opendarwin.org at mitzpettel.com>
   
           Reviewed by Darin.  Committed by David Harrison.
  
  
  
  1.80      +2 -6      WebCore/khtml/misc/loader.cpp
  
  Index: loader.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/loader.cpp,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- loader.cpp	24 Oct 2005 18:58:51 -0000	1.79
  +++ loader.cpp	24 Oct 2005 21:52:01 -0000	1.80
  @@ -226,10 +226,8 @@
   {
       if (!chs.isEmpty()) {
           QTextCodec *codec = QTextCodec::codecForName(chs.latin1());
  -        if (codec) {
  -            delete m_codec;
  +        if (codec)
               m_codec = codec;
  -        }
       }
   }
   
  @@ -320,10 +318,8 @@
   {
       if (!chs.isEmpty()) {
           QTextCodec *codec = QTextCodec::codecForName(chs.latin1());
  -        if (codec) {
  -            delete m_codec;
  +        if (codec)
               m_codec = codec;
  -        }
       }
   }