Skip to content

Commit c466923

Browse files
authored
Fix race condition in __CFStringGetEightBitStringEncoding (#5155)
1 parent 25d044f commit c466923

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

Sources/CoreFoundation/include/ForFoundationOnly.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,11 @@ CF_EXPORT CFStringEncoding __CFDefaultEightBitStringEncoding;
287287
CF_EXPORT CFStringEncoding __CFStringComputeEightBitStringEncoding(void);
288288

289289
CF_INLINE CFStringEncoding __CFStringGetEightBitStringEncoding(void) {
290-
if (__CFDefaultEightBitStringEncoding == kCFStringEncodingInvalidId) __CFStringComputeEightBitStringEncoding();
291-
return __CFDefaultEightBitStringEncoding;
290+
if (__CFDefaultEightBitStringEncoding == kCFStringEncodingInvalidId) {
291+
return __CFStringComputeEightBitStringEncoding();
292+
} else {
293+
return __CFDefaultEightBitStringEncoding;
294+
}
292295
}
293296

294297
enum {

0 commit comments

Comments
 (0)