Skip to content

Fix some force unwraps and type conversion issues in OpenStepPlist #1430

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
Jul 15, 2025
Merged

Fix some force unwraps and type conversion issues in OpenStepPlist #1430

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
18 changes: 13 additions & 5 deletions Sources/FoundationEssentials/PropertyList/OpenStepPlist.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,13 @@ private func parseQuotedPlistString(_ pInfo: inout _ParseInfo, quote: UInt16) ->
pInfo.err = OpenStepPlistError("Unterminated backslash sequence on line \(lineNumberStrings(pInfo))")
return nil
}

result!.unicodeScalars.append(UnicodeScalar(getSlashedChar(&pInfo))!)

guard let scalar = UnicodeScalar(getSlashedChar(&pInfo)) else {
pInfo.err = OpenStepPlistError("Invalid character on line \(lineNumberStrings(pInfo))")
return nil
}

result!.unicodeScalars.append(scalar)
mark = pInfo.curr
} else {
pInfo.advance()
Expand Down Expand Up @@ -406,7 +411,10 @@ private func getDataBytes(_ pInfo: inout _ParseInfo, bytes: UnsafeMutableBufferP
return numBytesRead
}

func fromHexDigit(ch: UInt8) -> UInt8? {
func fromHexDigit(ch: UInt16) -> UInt8? {
guard let ch = UInt8(exactly: ch) else {
return nil
}
if isdigit(Int32(ch)) != 0 {
return ch &- UInt8(ascii: "0")
}
Expand All @@ -419,14 +427,14 @@ private func getDataBytes(_ pInfo: inout _ParseInfo, bytes: UnsafeMutableBufferP
return nil
}

if let first = fromHexDigit(ch: UInt8(ch1)) {
if let first = fromHexDigit(ch: ch1) {
pInfo.advance()
if pInfo.isAtEnd {
return -2 // Error: uneven number of hex digits
}

let ch2 = pInfo.currChar
guard let second = fromHexDigit(ch: UInt8(ch2)) else {
guard let second = fromHexDigit(ch: ch2) else {
return -2 // Error: uneven number of hex digits
}

Expand Down