Commit fd147c8

authored

SwiftWin32: compensate for GetComputerNameW's disregard of the null terminator

### Issue `GetComputerNameW` disregards the null terminator when returning the size of the buffer. This leads to the following error when using `Device.name`: `Swift/CString.swift:284: Fatal error: input of decodeCString(_:as:repairingInvalidCodeUnits:) must be null-terminated` ### Solution Compensated the buffer size to account for the null terminator.

1 parent fe0b6b8 commit fd147c8Copy full SHA for fd147c8

File tree

1 file changed

-1

lines changed

Sources/SwiftWin32/App and Environment
- Device.swift

1 file changed

-1

lines changed

`‎Sources/SwiftWin32/App and Environment/Device.swift‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public struct Device {`
`15`	`15`	`let value: [WCHAR] =`
`16`	`16`	`Array<WCHAR>(unsafeUninitializedCapacity: Int(MAX_COMPUTERNAME_LENGTH) + 1) {`
`17`	`17`	`var nSize: DWORD = DWORD(0ドル.count)`
`18`		`- 1ドル = GetComputerNameW(0ドル.baseAddress!, &nSize) ? Int(nSize) : 0`
	`18`	`+ 1ドル = GetComputerNameW(0ドル.baseAddress!, &nSize) ? Int(nSize) +1: 0`
`19`	`19`	`}`
`20`	`20`	`return String(decodingCString: value, as: UTF16.self)`
`21`	`21`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit fd147c8

File tree

1 file changed

1 file changed

`‎Sources/SwiftWin32/App and Environment/Device.swift‎`

0 commit comments