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

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:56:01 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit eae82d21e602fdbe99b7aef424481e4370cf4fbe
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 21 23:03:55 2002 +0000

    Top level:
    	* Tests/harness.c: (main): Set DYLD_IMAGE_SUFFIX to "_debug" so our
    	automated tests all run with assertions enabled.
    
    	* Tests/libiftest/IFCheckLeaks.c: (IFCheckLeaksAtExitHandler): but
    	turn if off before launching `leaks', since it makes `leaks' fail
    	in spectacular ways.
    WebCore:
    	* src/kwq/KWQString.mm: (QString::fromCFString): Don't pass a
    	length to CFStringCreateMutableCopy, since that makes the string
    	fixed-length, which makes assertions fail when in debugging mode.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@649 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9a92d2c..4b89e19 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-02-21  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/KWQString.mm: (QString::fromCFString): Don't pass a
+	length to CFStringCreateMutableCopy, since that makes the string
+	fixed-length, which makes assertions fail when in debugging mode.
+
 2002-02-20  Richard Williamson  <rjw at apple.com>
 
     Some groundwork to bring WebFoundation callbacks up to 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9a92d2c..4b89e19 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-02-21  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/KWQString.mm: (QString::fromCFString): Don't pass a
+	length to CFStringCreateMutableCopy, since that makes the string
+	fixed-length, which makes assertions fail when in debugging mode.
+
 2002-02-20  Richard Williamson  <rjw at apple.com>
 
     Some groundwork to bring WebFoundation callbacks up to 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9a92d2c..4b89e19 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-02-21  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/KWQString.mm: (QString::fromCFString): Don't pass a
+	length to CFStringCreateMutableCopy, since that makes the string
+	fixed-length, which makes assertions fail when in debugging mode.
+
 2002-02-20  Richard Williamson  <rjw at apple.com>
 
     Some groundwork to bring WebFoundation callbacks up to 
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 17744c5..8a1dd79 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -161,7 +161,7 @@ QString QString::fromCFString(CFStringRef cfs)
     CFMutableStringRef ref;
     QString qs;
 
-    ref = CFStringCreateMutableCopy(NULL, CFStringGetLength(cfs), cfs);
+    ref = CFStringCreateMutableCopy(NULL, 0, cfs);
     qs = QString::fromCFMutableString(ref);
 #ifdef KWQ_STRING_DEBUG
 #else
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index 17744c5..8a1dd79 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -161,7 +161,7 @@ QString QString::fromCFString(CFStringRef cfs)
     CFMutableStringRef ref;
     QString qs;
 
-    ref = CFStringCreateMutableCopy(NULL, CFStringGetLength(cfs), cfs);
+    ref = CFStringCreateMutableCopy(NULL, 0, cfs);
     qs = QString::fromCFMutableString(ref);
 #ifdef KWQ_STRING_DEBUG
 #else

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list