diff --git a/Sources/ContainerizationEXT4/EXT4+Xattrs.swift b/Sources/ContainerizationEXT4/EXT4+Xattrs.swift
index 6038ecd1..e6ee7096 100644
--- a/Sources/ContainerizationEXT4/EXT4+Xattrs.swift
+++ b/Sources/ContainerizationEXT4/EXT4+Xattrs.swift
@@ -257,19 +257,22 @@ extension EXT4 {
             var i = start
             var attribs: [ExtendedAttribute] = []
             // 16 is the size of 1 XAttrEntry
-            while i + 16 < buffer.count {
+            while i + 16 <= buffer.count {
                 let attributeStart = i
                 let rawXattrEntry = Array(buffer[i..<i + 16])
                 let xattrEntry = try EXT4.XAttrEntry(using: rawXattrEntry)
                 i += 16
                 var endIndex = i + Int(xattrEntry.nameLength)
-                guard endIndex < buffer.count else {
+                guard endIndex <= buffer.count else {
                     continue
                 }
                 let rawName = buffer[i..<endIndex]
                 let name = String(bytes: rawName, encoding: .ascii)!
                 let valueStart = Int(xattrEntry.valueOffset) + offset
                 let valueEnd = Int(xattrEntry.valueOffset) + Int(xattrEntry.valueSize) + offset
+                guard valueEnd <= buffer.count else {
+                    break
+                }
                 let value = [UInt8](buffer[valueStart..<valueEnd])
                 let xattr = ExtendedAttribute(idx: xattrEntry.nameIndex, compressedName: name, value: value)
                 attribs.append(xattr)
diff --git a/Tests/ContainerizationEXT4Tests/TestEXT4ExtendedAttributes.swift b/Tests/ContainerizationEXT4Tests/TestEXT4ExtendedAttributes.swift
index 21706979..d62c5eb5 100644
--- a/Tests/ContainerizationEXT4Tests/TestEXT4ExtendedAttributes.swift
+++ b/Tests/ContainerizationEXT4Tests/TestEXT4ExtendedAttributes.swift
@@ -51,6 +51,34 @@ struct TestEXT4ExtendedAttribute {
         }
     }
 
+    @Test func lastXattrNotDroppedAtBufferBoundary() throws {
+        let buffer: [UInt8] = [
+            0,  // nameLength
+            8,  // nameIndex
+            0, 0,  // valueOffset
+            0, 0, 0, 0,  // valueInum
+            0, 0, 0, 0,  // valueSize
+            0, 0, 0, 0,  // hash
+        ]
+        let attrs = try EXT4.FileXattrsState.read(buffer: buffer, start: 0, offset: 0)
+        try #require(attrs.count == 1)
+        #expect(attrs[0].fullName == "system.richacl")
+    }
+
+    @Test func xattrOutOfBoundsValueDoesNotCrash() throws {
+        let buffer: [UInt8] = [
+            1,  // nameLength
+            1,  // nameIndex
+            17, 0,  // valueOffset
+            0, 0, 0, 0,  // valueInum
+            4, 0, 0, 0,  // valueSize
+            0, 0, 0, 0,  // hash
+            UInt8(ascii: "a"), 0, 0, 0,  // name
+        ]
+        let attrs = try EXT4.FileXattrsState.read(buffer: buffer, start: 0, offset: 0)
+        #expect(attrs.isEmpty)
+    }
+
     @Test func encodeDecodeAttributes() {
         let xattrs: [String: Data] = [
             "foo.bar": Data([1, 2, 3]),