CF-550.43.tar.gz

diff --git a/CFStringEncodings.c b/CFStringEncodings.c
index 6807c114069239a4d50ebdffc47b46354771be4f..4710f6810b877751c8034024535d7ac7f494ee37 100644 (file)
--- 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;
 
     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) {
         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;
         }
     } 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;
 
         bool swap = false;
         static bool strictUTF32 = (bool)-1;
 

diff --git a/Info.plist b/Info.plist
index a91b556e5187181aa4faf15b0670a61417b3d66c..d83c6eb0fcc23951ceb6066987584379b94606da 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -19,7 +19,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>550.42</string>
+       <string>550.43</string>

        <key>CarbonLazyValues</key>
        <dict>
                <key>CodeFragmentManager</key>
        <key>CarbonLazyValues</key>
        <dict>
                <key>CodeFragmentManager</key>