Skip to content

Potential stack buffer overflow in _withFixedCharBuffer #672

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.

Sign up for GitHub

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 11, 2024
Merged

Potential stack buffer overflow in _withFixedCharBuffer #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion Sources/FoundationInternationalization/ICU/ICU+Foundation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ internal func _withResizingCharBuffer(initialSize: Int32 = 32, _ body: (UnsafeMu
var innerStatus = U_ZERO_ERROR
if let innerLen = body(innerBuffer.baseAddress!, len + 1, &innerStatus) {
if innerStatus.isSuccess && innerLen > 0 {
buffer[Int(innerLen)] = 0
return String(validatingUTF8: innerBuffer.baseAddress!)
}
}
Expand All @@ -122,6 +123,7 @@ internal func _withResizingCharBuffer(initialSize: Int32 = 32, _ body: (UnsafeMu
return nil
}
} else if status.isSuccess && len > 0 {
buffer[Int(len)] = 0
return String(validatingUTF8: buffer.baseAddress!)
}
}
Expand All @@ -137,7 +139,7 @@ internal func _withFixedCharBuffer(size: Int32 = ULOC_FULLNAME_CAPACITY + ULOC_K
var status = U_ZERO_ERROR
if let len = body(buffer.baseAddress!, size, &status) {
if status.isSuccess && len > 0 {
buffer[Int(len + 1)] = 0
buffer[Int(len)] = 0
return String(validatingUTF8: buffer.baseAddress!)
}
}
Expand Down
4 changes: 3 additions & 1 deletion Sources/FoundationInternationalization/Locale/Locale_ICU.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1615,7 +1615,9 @@ extension Locale {
}

internal static func keywordValue(identifier: String, key: String) -> String? {
return _withFixedCharBuffer(size: ULOC_KEYWORD_AND_VALUES_CAPACITY) { buffer, size, status in
// Unlike other many ICU variables, `ULOC_KEYWORD_AND_VALUES_CAPACITY` does not include null-termination.
// Manually add one here.
return _withFixedCharBuffer(size: ULOC_KEYWORD_AND_VALUES_CAPACITY + 1) { buffer, size, status in
return uloc_getKeywordValue(identifier, key, buffer, size, &status)
}
}
Expand Down
5 changes: 5 additions & 0 deletions Tests/FoundationInternationalizationTests/LocaleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,11 @@ final class LocalePropertiesTests : XCTestCase {

verify("ar_EG@calendar=ethioaa;collation=dict;currency=frf;fw=fri;hours=h11;measure=uksystem;numbers=traditio;rg=uszzzz;sd=usca", expectedLanguage: "ar", script: "arab", languageRegion: "EG", region: "us", subdivision: "usca", measurementSystem: .uk, calendar: .ethiopicAmeteAlem, hourCycle: .zeroToEleven, currency: "FRF", numberingSystem: "traditio", numberingSystems: [ "traditio", "latn", "arab" ], firstDayOfWeek: .friday, collation: "dict")
}

func test_longLocaleKeywordValues() {
let x = Locale.keywordValue(identifier: "ar_EG@vt=kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk", key: "vt")
XCTAssertEqual(x, "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk")
}
}

// MARK: - Bridging Tests
Expand Down