[SR-3052] Use UTF-8 string length where UTF-8 encoding is used.

Author: Sergey Minakov

CoreFoundation/AppServices.subproj/CFUserNotification.c

@@ -198,7 +198,7 @@ static SInt32 _CFUserNotificationSendRequest(CFAllocatorRef allocator, CFStringR
     if (sessionID) {
         char sessionid[MAX_PORT_NAME_LENGTH + 1];
         CFIndex len = MAX_PORT_NAME_LENGTH - sizeof(NOTIFICATION_PORT_NAME) - sizeof(NOTIFICATION_PORT_NAME_SUFFIX);
-        CFStringGetBytes(sessionID, CFRangeMake(0, CFStringGetLength(sessionID)), kCFStringEncodingUTF8, 0, false, (uint8_t *)sessionid, len, &size);
+        CFStringGetBytes(sessionID, CFRangeMake(0, CFStringGetLengthUTF8(sessionID)), kCFStringEncodingUTF8, 0, false, (uint8_t *)sessionid, len, &size);
         sessionid[len - 1] = '\0';
         strlcat(namebuffer, NOTIFICATION_PORT_NAME_SUFFIX, sizeof(namebuffer));
         strlcat(namebuffer, sessionid, sizeof(namebuffer));

CoreFoundation/Base.subproj/CFPlatform.c

@@ -767,7 +767,7 @@ static wchar_t *createWideFileSystemRepresentation(const char *str, CFIndex *res
 static void copyToNarrowFileSystemRepresentation(const wchar_t *wide, CFIndex dstBufSize, char *dstbuf) {
     // Get the real length of the wide string in UTF8 characters
     CFStringRef cfStr = CFStringCreateWithCharacters(kCFAllocatorSystemDefault, (const UniChar *)wide, wcslen(wide));
-    CFIndex strLen = CFStringGetLength(cfStr);
+    CFIndex strLen = CFStringGetLengthUTF8(cfStr);
     CFIndex bytesUsed;
 
     // Copy the wide string into the buffer and terminate

CoreFoundation/Base.subproj/CFRuntime.c

@@ -1797,12 +1797,12 @@ const char *_NSPrintForDebugger(void *cf) {
         }
 
         CFIndex bufferSize = 0;
-        CFIndex numberConverted = CFStringGetBytes((CFStringRef)cf, CFRangeMake(0, CFStringGetLength((CFStringRef)cf)), kCFStringEncodingUTF8, 0, false, NULL, 0, &bufferSize);
+        CFIndex numberConverted = CFStringGetBytes((CFStringRef)cf, CFRangeMake(0, CFStringGetLengthUTF8((CFStringRef)cf)), kCFStringEncodingUTF8, 0, false, NULL, 0, &bufferSize);
         const char *result = malloc(bufferSize);
         if (!result) {
             return "<unable to fetch description>";
         }
-        CFStringGetBytes((CFStringRef)cf, CFRangeMake(0, CFStringGetLength((CFStringRef)cf)), kCFStringEncodingUTF8, 0, false, (UInt8 *)result, bufferSize, NULL);
+        CFStringGetBytes((CFStringRef)cf, CFRangeMake(0, CFStringGetLengthUTF8((CFStringRef)cf)), kCFStringEncodingUTF8, 0, false, (UInt8 *)result, bufferSize, NULL);
         // Yes, this leaks
         return result;
     }

CoreFoundation/Base.subproj/CFUtilities.c

@@ -496,11 +496,11 @@ const char *_CFPrintForDebugger(const void *obj) {
 	}
 
 	if (str != NULL) {
-		CFStringGetBytes(str, CFRangeMake(0, CFStringGetLength(str)), kCFStringEncodingUTF8, 0, FALSE, NULL, 0, &cnt);
+		CFStringGetBytes(str, CFRangeMake(0, CFStringGetLengthUTF8(str)), kCFStringEncodingUTF8, 0, FALSE, NULL, 0, &cnt);
 	}
 	result = (char *) malloc(cnt + 2);	// 1 for '\0', 1 for an optional '\n'
 	if (str != NULL) {
-		CFStringGetBytes(str, CFRangeMake(0, CFStringGetLength(str)), kCFStringEncodingUTF8, 0, FALSE, (UInt8 *) result, cnt, &cnt);
+		CFStringGetBytes(str, CFRangeMake(0, CFStringGetLengthUTF8(str)), kCFStringEncodingUTF8, 0, FALSE, (UInt8 *) result, cnt, &cnt);
 	}
 	result[cnt] = '\0';
 

CoreFoundation/Parsing.subproj/CFPropertyList.c

@@ -1074,7 +1074,7 @@ static void parseEntityReference_pl(_CFXMLPlistParseInfo *pInfo, CFMutableDataRe
                     }
                     uint8_t tmpBuf[6]; // max of 6 bytes for UTF8
                     CFIndex tmpBufLength = 0;
-                    CFStringGetBytes(oneChar, CFRangeMake(0, CFStringGetLength(oneChar)), kCFStringEncodingUTF8, 0, NO, tmpBuf, 6, &tmpBufLength);
+                    CFStringGetBytes(oneChar, CFRangeMake(0, CFStringGetLengthUTF8(oneChar)), kCFStringEncodingUTF8, 0, NO, tmpBuf, 6, &tmpBufLength);
                     CFDataAppendBytes(stringData, tmpBuf, tmpBufLength);
                     __CFPListRelease(oneChar, pInfo->allocator);
                     return;
@@ -2464,10 +2464,10 @@ static Boolean _CFPropertyListCreateFromUTF8Data(CFAllocatorRef allocator, CFDat
 
 static CFDataRef _createUTF8DataFromString(CFAllocatorRef allocator, CFStringRef str) {
     CFIndex bytesNeeded = 0;
-    CFStringGetBytes(str, CFRangeMake(0, CFStringGetLength(str)), kCFStringEncodingUTF8, 0, false, NULL, 0, &bytesNeeded);
+    CFStringGetBytes(str, CFRangeMake(0, CFStringGetLengthUTF8(str)), kCFStringEncodingUTF8, 0, false, NULL, 0, &bytesNeeded);
 
     const char *bytes = (const char *)CFAllocatorAllocate(allocator, bytesNeeded, 0);
-    CFStringGetBytes(str, CFRangeMake(0, CFStringGetLength(str)), kCFStringEncodingUTF8, 0, false, (uint8_t *)bytes, bytesNeeded, NULL);
+    CFStringGetBytes(str, CFRangeMake(0, CFStringGetLengthUTF8(str)), kCFStringEncodingUTF8, 0, false, (uint8_t *)bytes, bytesNeeded, NULL);
 
     CFDataRef utf8Data = CFDataCreateWithBytesNoCopy(allocator, (const UInt8 *)bytes, bytesNeeded, allocator);
     return utf8Data;

CoreFoundation/PlugIn.subproj/CFBundle_Locale.c

@@ -683,7 +683,7 @@ static CFMutableArrayRef _CFBundleCreateMutableArrayOfFallbackLanguages(CFArrayR
             CFIndex usedLength;
 
             // The max size available is -1 because we need to reserve space for the last NULL byte.
-            CFIndex theLocalizationLength = CFStringGetLength(theLocalization);
+            CFIndex theLocalizationLength = CFStringGetLengthUTF8(theLocalization);
             CFIndex charactersConverted = CFStringGetBytes(theLocalization, CFRangeMake(0, theLocalizationLength), kCFStringEncodingUTF8, 0, false, (UInt8 *)strings, last - strings - 1, &usedLength);
             if (charactersConverted == theLocalizationLength) {
                 stringPointers[i] = strings;

CoreFoundation/RunLoop.subproj/CFMessagePort.c

@@ -297,7 +297,7 @@ static CFStringRef __CFMessagePortSanitizeStringName(CFStringRef name, uint8_t *
     CFIndex utflen;
     CFStringRef result = NULL;
     utfname = CFAllocatorAllocate(kCFAllocatorSystemDefault, __kCFMessagePortMaxNameLength + 1, 0);
-    CFStringGetBytes(name, CFRangeMake(0, CFStringGetLength(name)), kCFStringEncodingUTF8, 0, false, utfname, __kCFMessagePortMaxNameLength, &utflen);
+    CFStringGetBytes(name, CFRangeMake(0, CFStringGetLengthUTF8(name)), kCFStringEncodingUTF8, 0, false, utfname, __kCFMessagePortMaxNameLength, &utflen);
     utfname[utflen] = '\0';
     if (strlen((const char *)utfname) != utflen) {
 	/* PCA 9194709: refuse to sanitize a string with an embedded nul character */

CoreFoundation/URL.subproj/CFURL.c

@@ -939,7 +939,7 @@ static Boolean _appendPercentEscapesForCharacter(UniChar *ch, Boolean isSurrogat
 static CFStringRef UnescapeAllWithUTF8(CFAllocatorRef alloc, CFStringRef originalString) CF_RETURNS_RETAINED
 {
     CFStringRef result = NULL;
-    CFIndex strLength = CFStringGetLength(originalString);
+    CFIndex strLength = CFStringGetLengthUTF8(originalString);
     CFIndex maxBufferSize = CFStringGetMaximumSizeForEncoding(strLength, kCFStringEncodingUTF8);
     CFIndex stackBufferSize = 2096;
     STACK_BUFFER_DECL(UInt8, escapedStackBuf, stackBufferSize *2);
@@ -4152,7 +4152,7 @@ static Boolean CanonicalFileURLStringToFileSystemRepresentation(CFStringRef str,
     if ( inBuffer && inBufferLen ) {
         STACK_BUFFER_DECL(UInt8, stackEscapedBuf, PATH_MAX * 3);    // worst case size is every unicode code point could be a 3-byte UTF8 sequence
         UInt8 *escapedBuf;
-        CFIndex strLength = CFStringGetLength(str) - (fileURLPrefixLength - 1);
+        CFIndex strLength = CFStringGetLengthUTF8(str) - (fileURLPrefixLength - 1);
         if ( strLength != 0 ) {
             CFIndex maxBufLength = strLength * 3;
             CFIndex usedBufLen;