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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 610d1dc7093f80b8fb2356cdfe8923bf24f817f0
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 30 21:24:29 2002 +0000

    	Fixed a problem in this function where broken UTF-8 would cause a crash.
    
            * WebCore.pbproj/project.pbxproj:
            * kwq/KWQString.mm:
            (QString::fromStringWithEncoding)
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1946 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index bb91b79..65e7952 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-08-30  Ken Kocienda  <kocienda at apple.com>
+
+	Fixed a problem in this function where broken UTF-8 would cause a crash.
+
+        * WebCore.pbproj/project.pbxproj:
+        * kwq/KWQString.mm:
+        (QString::fromStringWithEncoding)
+
 2002-08-30  Richard Williamson (Home)  <rjw at apple.com>
 
         Removed debugging log.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index bb91b79..65e7952 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-08-30  Ken Kocienda  <kocienda at apple.com>
+
+	Fixed a problem in this function where broken UTF-8 would cause a crash.
+
+        * WebCore.pbproj/project.pbxproj:
+        * kwq/KWQString.mm:
+        (QString::fromStringWithEncoding)
+
 2002-08-30  Richard Williamson (Home)  <rjw at apple.com>
 
         Removed debugging log.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bb91b79..65e7952 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-08-30  Ken Kocienda  <kocienda at apple.com>
+
+	Fixed a problem in this function where broken UTF-8 would cause a crash.
+
+        * WebCore.pbproj/project.pbxproj:
+        * kwq/KWQString.mm:
+        (QString::fromStringWithEncoding)
+
 2002-08-30  Richard Williamson (Home)  <rjw at apple.com>
 
         Removed debugging log.
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index badfe67..9984f99 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -72,7 +72,6 @@
 				F58C8A07025BD3BC018635CA,
 				F531DDEC02F0C34D018635CA,
 			);
-			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			knownRegions = (
 				English,
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index a8f80c6..03c1c25 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -728,20 +728,17 @@ void QString::setBufferFromCFString(CFStringRef cfs)
     }
 }
 
-// This function is used by the decoder.  It will be replace with TEC eventually.
+// This function is used by the decoder. It will be replaced with TEC eventually.
 QString QString::fromStringWithEncoding(const char *chs, int len, CFStringEncoding encoding)
 {
     QString qs;
     
-    if (chs && *chs) {
-        CFMutableStringRef s = CFStringCreateMutable(kCFAllocatorDefault, 0);
-        CFStringRef decoderString = CFStringCreateWithBytes (kCFAllocatorDefault, (const UInt8 *)chs, len, encoding, false);
-        CFStringAppend (s, decoderString);
-
-        qs.setBufferFromCFString(s);
-
-        CFRelease (s);
-        CFRelease (decoderString);
+    if (chs && len > 0) {
+        CFStringRef s = CFStringCreateWithBytes (kCFAllocatorDefault, (const UInt8 *)chs, len, encoding, false);
+        if (s) {
+            qs.setBufferFromCFString(s);
+            CFRelease(s);
+        }
     }
     
     return qs;

-- 
WebKit Debian packaging