From: Apple <opensource@apple.com>
Date: Fri, 24 Jun 2011 16:05:08 +0000 (+0000)
Subject: CF-550.43.tar.gz
X-Git-Tag: mac-os-x-1068^0
X-Git-Url: https://git.saurik.com/apple/cf.git/commitdiff_plain/1bc9727363b949b2507a83df7bb7cdb58e99f633?ds=inline

CF-550.43.tar.gz
---

diff --git a/CFStringEncodings.c b/CFStringEncodings.c
index 6807c11..4710f68 100644
--- a/CFStringEncodings.c
+++ b/CFStringEncodings.c
@@ -148,7 +148,7 @@ Boolean __CFStringDecodeByteStream3(const uint8_t *bytes, CFIndex len, CFStringE
 
     if ((encoding == kCFStringEncodingUTF16) || (encoding == kCFStringEncodingUTF16BE) || (encoding == kCFStringEncodingUTF16LE)) { // UTF-16
         const UTF16Char *src = (const UTF16Char *)bytes;
-        const UTF16Char *limit = (const UTF16Char *)(bytes + len);
+	const UTF16Char *limit = src + (len / sizeof(UTF16Char));
         bool swap = false;
 
         if (kCFStringEncodingUTF16 == encoding) {
@@ -228,7 +228,7 @@ Boolean __CFStringDecodeByteStream3(const uint8_t *bytes, CFIndex len, CFStringE
         }
     } else if ((encoding == kCFStringEncodingUTF32) || (encoding == kCFStringEncodingUTF32BE) || (encoding == kCFStringEncodingUTF32LE)) {
         const UTF32Char *src = (const UTF32Char *)bytes;
-        const UTF32Char *limit = (const UTF32Char *)(bytes + len);
+	const UTF32Char *limit =  src + (len / sizeof(UTF32Char));
         bool swap = false;
         static bool strictUTF32 = (bool)-1;
 
diff --git a/Info.plist b/Info.plist
index a91b556..d83c6eb 100644
--- a/Info.plist
+++ b/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>550.42</string>
+	<string>550.43</string>
 	<key>CarbonLazyValues</key>
 	<dict>
 		<key>CodeFragmentManager</key>