Skip to content

Commit c054f57

Browse files
committed
[DNM] Test URL changes
1 parent bcaff0a commit c054f57

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Sources/Foundation/NSURL.swift

+1
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ open class NSURL : NSObject, NSSecureCoding, NSCopying, @unchecked Sendable {
326326
}
327327

328328
open var baseURL: URL? {
329+
guard _baseURL != nil else { return nil }
329330
return CFURLGetBaseURL(_cfObject)?._swiftObject
330331
}
331332

Sources/Foundation/URL.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ extension URL : ReferenceConvertible {
502502
extension URL : _ObjectiveCBridgeable {
503503
@_semantics("convertToObjectiveC")
504504
public func _bridgeToObjectiveC() -> NSURL {
505-
return NSURL(string: self.absoluteString, relativeTo: self.baseURL)!
505+
return NSURL(string: self.relativeString, relativeTo: self.baseURL)!
506506
}
507507

508508
public static func _forceBridgeFromObjectiveC(_ source: NSURL, result: inout URL?) {
@@ -512,7 +512,7 @@ extension URL : _ObjectiveCBridgeable {
512512
}
513513

514514
public static func _conditionallyBridgeFromObjectiveC(_ source: NSURL, result: inout URL?) -> Bool {
515-
result = URL(string: source.absoluteString, relativeTo: source.baseURL)
515+
result = URL(string: source.relativeString, relativeTo: source.baseURL)
516516
return true
517517
}
518518

0 commit comments

Comments
 (0)