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

rjw rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:54:43 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit cb836bf47058e52c0cbda254e0bc11f1a2f7cb8f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 29 23:27:54 2002 +0000

    String fix.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@561 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 508d63e..c9a0420 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -1073,7 +1073,7 @@ QString &QString::append(const QString &qs)
 
 void QString::_copyInternalString()
 {
-    if (s) {
+    if (s && CFGetRetainCount(s) > 1) {
         CFMutableStringRef tmp;
         tmp = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, s);
         CFRelease (s);
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index 508d63e..c9a0420 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -1073,7 +1073,7 @@ QString &QString::append(const QString &qs)
 
 void QString::_copyInternalString()
 {
-    if (s) {
+    if (s && CFGetRetainCount(s) > 1) {
         CFMutableStringRef tmp;
         tmp = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, s);
         CFRelease (s);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list