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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@10937 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-12-19 b/WebCore/ChangeLog-2005-12-19
index b8792766c4b8e2ae7591f5d3425597415867c165..e20b2b4103a8cce1770cc4ad295f28e9d7dc6d5a 100644 (file)
--- a/WebCore/ChangeLog-2005-12-19
+++ b/WebCore/ChangeLog-2005-12-19
@@ -1,3 +1,15 @@
+2005-10-24  Alexey Proskuryakov  <ap@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@mitzpettel.com>
 
         Reviewed by Darin.  Committed by David Harrison.

diff --git a/WebCore/khtml/misc/loader.cpp b/WebCore/khtml/misc/loader.cpp
index 04fab417c621fb66b07ea8f2df0da610310c1dd2..59447d45037c359e6cd96993449740e62b8591fa 100644 (file)
--- a/WebCore/khtml/misc/loader.cpp
+++ b/WebCore/khtml/misc/loader.cpp
@@ -226,10 +226,8 @@ void CachedCSSStyleSheet::setCharset( const QString &chs )
 {
     if (!chs.isEmpty()) {
         QTextCodec *codec = QTextCodec::codecForName(chs.latin1());
-        if (codec) {
-            delete m_codec;
+        if (codec)
             m_codec = codec;
-        }
     }
 }
 
@@ -320,10 +318,8 @@ void CachedScript::setCharset( const QString &chs )
 {
     if (!chs.isEmpty()) {
         QTextCodec *codec = QTextCodec::codecForName(chs.latin1());
-        if (codec) {
-            delete m_codec;
+        if (codec)
             m_codec = codec;
-        }
     }
 }