Skip to content

Throw an error for non-ASCII xattr names #657

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

Open
dkovba wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −1
Open

Throw an error for non-ASCII xattr names #657

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
7 changes: 6 additions & 1 deletion Sources/ContainerizationEXT4/EXT4+Xattrs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,9 @@ extension EXT4 {
continue
}
let rawName = buffer[i..<endIndex]
let name = String(bytes: rawName, encoding: .ascii)!
guard let name = String(bytes: rawName, encoding: .ascii) else {
throw Error.nonAsciiXattrName
}
let valueStart = Int(xattrEntry.valueOffset) + offset
let valueEnd = Int(xattrEntry.valueOffset) + Int(xattrEntry.valueSize) + offset
let value = [UInt8](buffer[valueStart..<valueEnd])
Expand All @@ -290,6 +292,7 @@ extension EXT4 {
case insufficientSpace(_ inode: Int)
case malformedXattrBuffer
case convertAsciiString(_ s: String)
case nonAsciiXattrName
case missingXAttrHeader

public var description: String {
Expand All @@ -300,6 +303,8 @@ extension EXT4 {
return "malformed extended attribute buffer"
case .convertAsciiString(let s):
return "cannot convert string \(s) to a list of ASCII characters"
case .nonAsciiXattrName:
return "extended attribute name contains non-ASCII bytes"
case .missingXAttrHeader:
return "missing header for extended attribute entry"
}
Expand Down
Loading