From e56a70bdea1df80dd2dbd448f6fcc896d8d4147e Mon Sep 17 00:00:00 2001 From: Tony Parker Date: Tue, 22 Oct 2024 10:30:05 -0700 Subject: [PATCH] Ensure that NSCharacterSet always returns an NSObject on copy (follow up to #5107) rdar://138005684 (cherry picked from commit 592f015760cc760b2298ee29d3639969b480d044) --- Sources/Foundation/NSCharacterSet.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Foundation/NSCharacterSet.swift b/Sources/Foundation/NSCharacterSet.swift index 6e153906ba..ecb532dc79 100644 --- a/Sources/Foundation/NSCharacterSet.swift +++ b/Sources/Foundation/NSCharacterSet.swift @@ -371,9 +371,9 @@ open class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSSecureCodin open func copy(with zone: NSZone? = nil) -> Any { if type(of: self) == NSCharacterSet.self || type(of: self) == NSMutableCharacterSet.self { - return _CFCharacterSetCreateCopy(kCFAllocatorSystemDefault, self._cfObject) + return _CFCharacterSetCreateCopy(kCFAllocatorSystemDefault, self._cfObject)._nsObject } else if type(of: self) == _NSCFCharacterSet.self { - return CFCharacterSetCreateCopy(kCFAllocatorSystemDefault, self._cfObject) as Any + return CFCharacterSetCreateCopy(kCFAllocatorSystemDefault, self._cfObject)._nsObject } else { NSRequiresConcreteImplementation() }