From 16f2a296f5580b776e9e4474ee8c910f0fdabe25 Mon Sep 17 00:00:00 2001
From: Dmitry Kovba <dkovba@apple.com>
Date: Mon, 6 Apr 2026 18:34:50 -0700
Subject: [PATCH] Throw an error for non-ASCII xattr names

---
 Sources/ContainerizationEXT4/EXT4+Xattrs.swift | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Sources/ContainerizationEXT4/EXT4+Xattrs.swift b/Sources/ContainerizationEXT4/EXT4+Xattrs.swift
index 6038ecd1..d5242fa3 100644
--- a/Sources/ContainerizationEXT4/EXT4+Xattrs.swift
+++ b/Sources/ContainerizationEXT4/EXT4+Xattrs.swift
@@ -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])
@@ -290,6 +292,7 @@ extension EXT4 {
             case insufficientSpace(_ inode: Int)
             case malformedXattrBuffer
             case convertAsciiString(_ s: String)
+            case nonAsciiXattrName
             case missingXAttrHeader
 
             public var description: String {
@@ -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"
                 }