Skip to content

Base64 must relinquish use of OutputBuffer on error #700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions Sources/FoundationEssentials/OutputBuffer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,16 @@ extension String {
initializing: buffer.baseAddress.unsafelyUnwrapped,
capacity: capacity
)
try initializer(&output)
let initialized = output.relinquishBorrowedMemory()
assert(initialized.baseAddress == buffer.baseAddress)
return initialized.count
do {
try initializer(&output)
let initialized = output.relinquishBorrowedMemory()
assert(initialized.baseAddress == buffer.baseAddress)
return initialized.count
} catch {
// Do this regardless of outcome
_ = output.relinquishBorrowedMemory()
throw error
}
}
)
}
Expand All @@ -216,11 +222,17 @@ extension Data {
initializing: buffer.baseAddress.unsafelyUnwrapped,
capacity: capacity
)
try initializer(&output)
let initialized = output.relinquishBorrowedMemory()
assert(initialized.baseAddress == buffer.baseAddress)
buffer[initialized.count..<buffer.count].initialize(repeating: 0)
return initialized.count
do {
try initializer(&output)
let initialized = output.relinquishBorrowedMemory()
assert(initialized.baseAddress == buffer.baseAddress)
buffer[initialized.count..<buffer.count].initialize(repeating: 0)
return initialized.count
} catch {
// Do this regardless of outcome
_ = output.relinquishBorrowedMemory()
throw error
}
}
}
assert(count <= self.count)
Expand Down
4 changes: 4 additions & 0 deletions Tests/FoundationEssentialsTests/DataTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1804,6 +1804,10 @@ extension DataTests {
XCTAssertEqual("SGVsbG8gV29ybGQ=", base64, "trivial base64 conversion should work")
}

func test_base64Data_bad() {
XCTAssertNil(Data(base64Encoded: "signature-not-base64-encoded"))
}

func test_base64Data_medium() {
let data = Data("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut at tincidunt arcu. Suspendisse nec sodales erat, sit amet imperdiet ipsum. Etiam sed ornare felis. Nunc mauris turpis, bibendum non lectus quis, malesuada placerat turpis. Nam adipiscing non massa et semper. Nulla convallis semper bibendum. Aliquam dictum nulla cursus mi ultricies, at tincidunt mi sagittis. Nulla faucibus at dui quis sodales. Morbi rutrum, dui id ultrices venenatis, arcu urna egestas felis, vel suscipit mauris arcu quis risus. Nunc venenatis ligula at orci tristique, et mattis purus pulvinar. Etiam ultricies est odio. Nunc eleifend malesuada justo, nec euismod sem ultrices quis. Etiam nec nibh sit amet lorem faucibus dapibus quis nec leo. Praesent sit amet mauris vel lacus hendrerit porta mollis consectetur mi. Donec eget tortor dui. Morbi imperdiet, arcu sit amet elementum interdum, quam nisl tempor quam, vitae feugiat augue purus sed lacus. In ac urna adipiscing purus venenatis volutpat vel et metus. Nullam nec auctor quam. Phasellus porttitor felis ac nibh gravida suscipit tempus at ante. Nunc pellentesque iaculis sapien a mattis. Aenean eleifend dolor non nunc laoreet, non dictum massa aliquam. Aenean quis turpis augue. Praesent augue lectus, mollis nec elementum eu, dignissim at velit. Ut congue neque id ullamcorper pellentesque. Maecenas euismod in elit eu vehicula. Nullam tristique dui nulla, nec convallis metus suscipit eget. Cras semper augue nec cursus blandit. Nulla rhoncus et odio quis blandit. Praesent lobortis dignissim velit ut pulvinar. Duis interdum quam adipiscing dolor semper semper. Nunc bibendum convallis dui, eget mollis magna hendrerit et. Morbi facilisis, augue eu fringilla convallis, mauris est cursus dolor, eu posuere odio nunc quis orci. Ut eu justo sem. Phasellus ut erat rhoncus, faucibus arcu vitae, vulputate erat. Aliquam nec magna viverra, interdum est vitae, rhoncus sapien. Duis tincidunt tempor ipsum ut dapibus. Nullam commodo varius metus, sed sollicitudin eros. Etiam nec odio et dui tempor blandit posuere.".utf8)
let base64 = data.base64EncodedString()
Expand Down