[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit fa7c194cd37b6a7c9f822591b66a9ccd6733aa04
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 6 19:23:45 2002 +0000

    	- fixed 3046737 -- infinite loop in font name matching code on some pages
    
            * kwq/KWQString.mm: (QString::replace): Removed the incorrect early exit if
    	the passed in string was the empty string.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2261 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 90a2791..704984c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-06  Darin Adler  <darin at apple.com>
+
+	- fixed 3046737 -- infinite loop in font name matching code on some pages
+
+        * kwq/KWQString.mm: (QString::replace): Removed the incorrect early exit if
+	the passed in string was the empty string.
+
 2002-10-04  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKURL.mm: (KURL::parse): Fix code that adds "//" to file URLs.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 90a2791..704984c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-10-06  Darin Adler  <darin at apple.com>
+
+	- fixed 3046737 -- infinite loop in font name matching code on some pages
+
+        * kwq/KWQString.mm: (QString::replace): Removed the incorrect early exit if
+	the passed in string was the empty string.
+
 2002-10-04  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKURL.mm: (KURL::parse): Fix code that adds "//" to file URLs.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 90a2791..704984c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-10-06  Darin Adler  <darin at apple.com>
+
+	- fixed 3046737 -- infinite loop in font name matching code on some pages
+
+        * kwq/KWQString.mm: (QString::replace): Removed the incorrect early exit if
+	the passed in string was the empty string.
+
 2002-10-04  Darin Adler  <darin at apple.com>
 
         * kwq/KWQKURL.mm: (KURL::parse): Fix code that adds "//" to file URLs.
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 864d31a..0d5f6cf 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -2384,16 +2384,7 @@ QString &QString::remove(uint index, uint len)
 
 QString &QString::replace( uint index, uint len, const QString &str )
 {
-    // No need to detach here, detach will happen if necessary
-    // in remove() or insert().
-    
-    if (str.data()->_length == 0)
-        return *this;
-        
-    remove( index, len );
-    insert( index, str );
-
-    return *this;
+    return remove(index, len).insert(index, str);
 }
 
 QString &QString::replace(const QRegExp &qre, const QString &str)

-- 
WebKit Debian packaging