This function is not clear in that the else branch ALWAYS following the rest of the method due to early returns. Because the two top branches always return, I removed the else statement, and put encoding & 0xFFF in the switch statement itself instead of modifying the encoding directly. (#2550)

Author: pi1024e

CoreFoundation/String.subproj/CFString.c

@@ -459,12 +459,12 @@ CFStringEncoding CFStringFileSystemEncoding(void) {
 CFIndex CFStringGetMaximumSizeForEncoding(CFIndex length, CFStringEncoding encoding) {
     if (encoding == kCFStringEncodingUTF8) {
             return (length > (LONG_MAX / 3)) ? kCFNotFound : (length * 3);
-    } else if ((encoding == kCFStringEncodingUTF32) || (encoding == kCFStringEncodingUTF32BE) || (encoding == kCFStringEncodingUTF32LE)) { // UTF-32
+    }
+    if ((encoding == kCFStringEncodingUTF32) || (encoding == kCFStringEncodingUTF32BE) || (encoding == kCFStringEncodingUTF32LE)) { // UTF-32
         return (length > (LONG_MAX / sizeof(UTF32Char))) ? kCFNotFound : (length * sizeof(UTF32Char));
-    } else {
-        encoding &= 0xFFF; // Mask off non-base part
     }
-    switch (encoding) {
+
+    switch (encoding & 0xFFF) {  // Mask off non-base part
         case kCFStringEncodingUnicode:
             return (length > (LONG_MAX / sizeof(UniChar))) ? kCFNotFound : (length * sizeof(UniChar));
 
@@ -476,8 +476,6 @@ CFIndex CFStringGetMaximumSizeForEncoding(CFIndex length, CFStringEncoding encod
         case kCFStringEncodingISOLatin1:
         case kCFStringEncodingNextStepLatin:
         case kCFStringEncodingASCII:
-            return length / sizeof(uint8_t);
-
         default:
             return length / sizeof(uint8_t);
     }