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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 0b66b63b58415ee3ff9d9e23546961f5716ef784
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 22 06:31:57 2002 +0000

    Top level:
    	* Tests/harness.c: (runtest): Run regression tests with debug
    	frameworks. If they pass, run them again so the leak checker
    	actually works (it never finds leaks with the debug frameworks in
    	use).
    
    	Fix regression test failures:
    
    	* Tests/CookieManager/wkcookie-test.m: (main):
    	* Tests/WebFoundation-Misc/ifnsobjectextensions-test.m: (main):
    WebCore:
    	* src/kwq/KWQString.mm: (QString::fill): Fix a bug that was
    	triggering assertion failures in CF.
    
    	* src/kdelibs/kjs/kjs-test: Turn off some environment variables to
    	make the tests pass.
    WebFoundation:
    	* Misc.subproj/IFNSStringExtensions.m: (-[NSString
    	parseAsKeyValuePairHandleQuotes:]): Fix a bug that was leading to
    	an assertion failure.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@654 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/kjs/kjs-test b/JavaScriptCore/kjs/kjs-test
index 204b1eb..255c89f 100755
--- a/JavaScriptCore/kjs/kjs-test
+++ b/JavaScriptCore/kjs/kjs-test
@@ -1,8 +1,13 @@
 #!/bin/sh
 
-unsetenv MallocStackLogging
-unsetenv MallocScribble
-unsetenv MallocGuardEdges
+unset MallocStackLogging
+export MallocStackLogging
+unset MallocScribble
+export MallocScribble
+unset MallocGuardEdges
+export MallocGuardEdges
+unset DYLD_IMAGE_SUFFIX
+export DYLD_IMAGE_SUFFIX
 
 `dirname $0`/testkjs `dirname $0`/test.js 2>&1
 
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d0e55b9..d88d6fe 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-02-21  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/KWQString.mm: (QString::fill): Fix a bug that was
+	triggering assertion failures in CF.
+	
+	* src/kdelibs/kjs/kjs-test: Turn off some environment variables to
+	make the tests pass.
+
 2002-02-21  Richard Williamson  <rjw at apple.com>
 
     Stop mostly working.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d0e55b9..d88d6fe 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-02-21  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/KWQString.mm: (QString::fill): Fix a bug that was
+	triggering assertion failures in CF.
+	
+	* src/kdelibs/kjs/kjs-test: Turn off some environment variables to
+	make the tests pass.
+
 2002-02-21  Richard Williamson  <rjw at apple.com>
 
     Stop mostly working.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d0e55b9..d88d6fe 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-02-21  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/KWQString.mm: (QString::fill): Fix a bug that was
+	triggering assertion failures in CF.
+	
+	* src/kdelibs/kjs/kjs-test: Turn off some environment variables to
+	make the tests pass.
+
 2002-02-21  Richard Williamson  <rjw at apple.com>
 
     Stop mostly working.
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 8a1dd79..05ba4a1 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -1208,13 +1208,17 @@ void QString::fill(QChar qc, int len)
                 ucs[i] = qc.c;
             }
             s = CFStringCreateMutableWithExternalCharactersNoCopy(
-                    kCFAllocatorDefault, ucs, len, 0, kCFAllocatorDefault);
+                    kCFAllocatorDefault, ucs, len, len, kCFAllocatorDefault);
             if (!s) {
 #ifdef KWQ_STRING_DEBUG
 #else
                 CFAllocatorDeallocate(kCFAllocatorDefault, ucs);
 #endif
-            }
+            } else {
+		CFMutableStringRef tmp = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, s);
+		CFRelease(s);
+		s = tmp;
+	    }
         }
     }
 }
diff --git a/WebCore/src/kdelibs/kjs/kjs-test b/WebCore/src/kdelibs/kjs/kjs-test
index 204b1eb..255c89f 100755
--- a/WebCore/src/kdelibs/kjs/kjs-test
+++ b/WebCore/src/kdelibs/kjs/kjs-test
@@ -1,8 +1,13 @@
 #!/bin/sh
 
-unsetenv MallocStackLogging
-unsetenv MallocScribble
-unsetenv MallocGuardEdges
+unset MallocStackLogging
+export MallocStackLogging
+unset MallocScribble
+export MallocScribble
+unset MallocGuardEdges
+export MallocGuardEdges
+unset DYLD_IMAGE_SUFFIX
+export DYLD_IMAGE_SUFFIX
 
 `dirname $0`/testkjs `dirname $0`/test.js 2>&1
 
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index 8a1dd79..05ba4a1 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -1208,13 +1208,17 @@ void QString::fill(QChar qc, int len)
                 ucs[i] = qc.c;
             }
             s = CFStringCreateMutableWithExternalCharactersNoCopy(
-                    kCFAllocatorDefault, ucs, len, 0, kCFAllocatorDefault);
+                    kCFAllocatorDefault, ucs, len, len, kCFAllocatorDefault);
             if (!s) {
 #ifdef KWQ_STRING_DEBUG
 #else
                 CFAllocatorDeallocate(kCFAllocatorDefault, ucs);
 #endif
-            }
+            } else {
+		CFMutableStringRef tmp = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, s);
+		CFRelease(s);
+		s = tmp;
+	    }
         }
     }
 }

-- 
WebKit Debian packaging