diff --git a/src/types.rs b/src/types.rs
index 821a275c..e25bbcc4 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -320,6 +320,13 @@ impl Clone for AtomicU64 {
     }
 }
 
+#[derive(Debug, Clone)]
+pub struct ZipExtraDataField {
+    /// Header ID; indicates the type of the extra data
+    pub(crate) header_id: u16,
+    pub(crate) data: Vec<u8>
+}
+
 /// Structure representing a ZIP file.
 #[derive(Debug, Clone)]
 pub struct ZipFileData {
@@ -348,7 +355,7 @@ pub struct ZipFileData {
     /// Raw file name. To be used when file_name was incorrectly decoded.
     pub file_name_raw: Vec<u8>,
     /// Extra field usually used for storage expansion
-    pub extra_field: Vec<u8>,
+    pub extra_field: Vec<ZipExtraDataField>,
     /// File comment
     pub file_comment: String,
     /// Specifies where the local header of the file starts
diff --git a/src/write.rs b/src/write.rs
index 69f58d65..1ab5b595 100644
--- a/src/write.rs
+++ b/src/write.rs
@@ -1345,28 +1345,14 @@ fn write_central_directory_header<T: Write>(writer: &mut T, file: &ZipFileData)
 }
 
 fn validate_extra_data(file: &ZipFileData) -> ZipResult<()> {
-    let mut data = file.extra_field.as_slice();
-
-    if data.len() > spec::ZIP64_ENTRY_THR {
-        return Err(ZipError::Io(io::Error::new(
-            io::ErrorKind::InvalidData,
-            "Extra data exceeds extra field",
-        )));
-    }
-
-    while !data.is_empty() {
-        let left = data.len();
-        if left < 4 {
+    for field in &file.extra_field {
+        if field.data.len() > u16::MAX as usize {
             return Err(ZipError::Io(io::Error::new(
                 io::ErrorKind::Other,
-                "Incomplete extra data header",
+                "Extra-data field can't exceed u16::MAX bytes",
             )));
         }
-        let kind = data.read_u16::<LittleEndian>()?;
-        let size = data.read_u16::<LittleEndian>()? as usize;
-        let left = left - 4;
-
-        if kind == 0x0001 {
+        if field.header_id == 0x0001 {
             return Err(ZipError::Io(io::Error::new(
                 io::ErrorKind::Other,
                 "No custom ZIP64 extra data allowed",
@@ -1375,24 +1361,15 @@ fn validate_extra_data(file: &ZipFileData) -> ZipResult<()> {
 
         #[cfg(not(feature = "unreserved"))]
         {
-            if kind <= 31 || EXTRA_FIELD_MAPPING.iter().any(|&mapped| mapped == kind) {
+            if field.header_id <= 31 || EXTRA_FIELD_MAPPING.iter().any(|&mapped| mapped == kind) {
                 return Err(ZipError::Io(io::Error::new(
                     io::ErrorKind::Other,
                     format!(
-                        "Extra data header ID {kind:#06} requires crate feature \"unreserved\"",
+                        "Extra data header ID {field.header_id:#06} requires crate feature \"unreserved\"",
                     ),
                 )));
             }
         }
-
-        if size > left {
-            return Err(ZipError::Io(io::Error::new(
-                io::ErrorKind::Other,
-                "Extra data size exceeds extra field",
-            )));
-        }
-
-        data = &data[size..];
     }
 
     Ok(())