[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 2199f1566bea99e53d6ecea9be44fd32be9e4def
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 12 00:47:17 2001 +0000

    Properly initialize cache and cacheType members QConstString constructor
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@489 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index c26843b..25733ef 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -1560,12 +1560,11 @@ QConstString::QConstString(QChar *qcs, uint len)
         // guarantee backing store is not copied even though string is mutable
         s = CFStringCreateMutableWithExternalCharactersNoCopy(
                 kCFAllocatorDefault, &qcs->c, len, len, kCFAllocatorNull);
-// When is the memory freed?  Can we safely use the bytes???
-//        s = CFStringCreateMutable(kCFAllocatorDefault, 0);
-//        CFStringAppendCharacters (s, &qcs->c, len);
     } else {
         s = NULL;
     }
+    cache = NULL;
+    cacheType = CacheInvalid;
 }
 
 // member functions ------------------------------------------------------------
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index c26843b..25733ef 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -1560,12 +1560,11 @@ QConstString::QConstString(QChar *qcs, uint len)
         // guarantee backing store is not copied even though string is mutable
         s = CFStringCreateMutableWithExternalCharactersNoCopy(
                 kCFAllocatorDefault, &qcs->c, len, len, kCFAllocatorNull);
-// When is the memory freed?  Can we safely use the bytes???
-//        s = CFStringCreateMutable(kCFAllocatorDefault, 0);
-//        CFStringAppendCharacters (s, &qcs->c, len);
     } else {
         s = NULL;
     }
+    cache = NULL;
+    cacheType = CacheInvalid;
 }
 
 // member functions ------------------------------------------------------------

-- 
WebKit Debian packaging