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

[gramps]

The following commit has been merged in the debian/unstable branch:
commit 77e9edf27f5c9213949131fed8456df8b9164f5c
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 5 17:21:08 2001 +0000

    Fixed possible bug in replace
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@287 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index ec800c8..2aa30de 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -1030,9 +1030,9 @@ QString &QString::replace(const QRegExp &qre, const QString &qs)
     if (s) {
         int len = qs.length();
         for (int i = 0; i < CFStringGetLength(s); i += len) {
-            int width;
+            int width = 0;
             i = qre.match(*this, i, &width, FALSE);
-            if (i < 0) {
+            if ((i < 0) || !width) {
                 break;
             }
             CFRange r = CFRangeMake(i, width);
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index ec800c8..2aa30de 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -1030,9 +1030,9 @@ QString &QString::replace(const QRegExp &qre, const QString &qs)
     if (s) {
         int len = qs.length();
         for (int i = 0; i < CFStringGetLength(s); i += len) {
-            int width;
+            int width = 0;
             i = qre.match(*this, i, &width, FALSE);
-            if (i < 0) {
+            if ((i < 0) || !width) {
                 break;
             }
             CFRange r = CFRangeMake(i, width);

-- 
WebKit Debian packaging