let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: harden device model decoding

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-20 01:48:10 +01:00
parent afa4a234f9
commit 1b38ee8b46
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/ios/Sources/Bridge/BridgeConnectionController.swift
View File

@@ -221,9 +221,10 @@ final class BridgeConnectionController {
var systemInfo = utsname() var systemInfo = utsname()
uname(&systemInfo) uname(&systemInfo)
let machine = withUnsafeBytes(of: &systemInfo.machine) { ptr in let machine = withUnsafeBytes(of: &systemInfo.machine) { ptr in
String(decoding: ptr.prefix { $0 != 0 }, as: UTF8.self) String(bytes: ptr.prefix { $0 != 0 }, encoding: .utf8)
} }
return machine.isEmpty ? "unknown" : machine let trimmed = machine?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
return trimmed.isEmpty ? "unknown" : trimmed
} }
private func appVersion() -> String { private func appVersion() -> String {

5
apps/ios/Sources/Settings/SettingsTab.swift
View File

@@ -277,9 +277,10 @@ struct SettingsTab: View {
var systemInfo = utsname() var systemInfo = utsname()
uname(&systemInfo) uname(&systemInfo)
let machine = withUnsafeBytes(of: &systemInfo.machine) { ptr in let machine = withUnsafeBytes(of: &systemInfo.machine) { ptr in
String(decoding: ptr.prefix { $0 != 0 }, as: UTF8.self) String(bytes: ptr.prefix { $0 != 0 }, encoding: .utf8)
} }
return machine.isEmpty ? "unknown" : machine let trimmed = machine?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
return trimmed.isEmpty ? "unknown" : trimmed
} }
private func currentCaps() -> [String] { private func currentCaps() -> [String] {

5
apps/macos/Sources/Clawdis/InstanceIdentity.swift
View File

@@ -40,7 +40,8 @@ enum InstanceIdentity {
guard sysctlbyname("hw.model", &buffer, &size, nil, 0) == 0 else { return nil } guard sysctlbyname("hw.model", &buffer, &size, nil, 0) == 0 else { return nil }
let bytes = buffer.prefix { $0 != 0 }.map { UInt8(bitPattern: $0) } let bytes = buffer.prefix { $0 != 0 }.map { UInt8(bitPattern: $0) }
let s = String(decoding: bytes, as: UTF8.self).trimmingCharacters(in: .whitespacesAndNewlines) guard let raw = String(bytes: bytes, encoding: .utf8) else { return nil }
return s.isEmpty ? nil : s let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
return trimmed.isEmpty ? nil : trimmed
}() }()
} }