From 5a11cbeaee82199679a35897f5495c8e88f5e870 Mon Sep 17 00:00:00 2001
From: Chris Hennick <hennickc@amazon.com>
Date: Thu, 11 May 2023 21:02:51 -0700
Subject: [PATCH] Bug fix

---
 src/write.rs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/write.rs b/src/write.rs
index daf93465..83698965 100644
--- a/src/write.rs
+++ b/src/write.rs
@@ -1038,20 +1038,20 @@ impl<W: Write + Seek> ZipWriter<W> {
 #[cfg_attr(fuzzing, allow(missing_docs))]
 pub(crate) fn validate_name(name: &String) -> ZipResult<()> {
     let bytes = name.as_bytes();
-    for (index, _) in name.match_indices("PK") {
-        if bytes.len() >= index + 4 {
-            let magic_number = (&bytes[index..]).read_u32::<LittleEndian>()?;
-            match magic_number {
-                spec::ZIP64_CENTRAL_DIRECTORY_END_SIGNATURE => {
-                    return Err(InvalidArchive("Filename can't contain ZIP64 end signature"));
-                }
-                spec::ZIP64_CENTRAL_DIRECTORY_END_LOCATOR_SIGNATURE => {
-                    return Err(InvalidArchive(
-                        "Filename can't contain ZIP64 end-locator signature",
-                    ));
-                }
-                _ => {}
+    let mut current_window = [0u8; 4];
+    for window in bytes.windows(4) {
+        current_window.copy_from_slice(window);
+        let magic_number = u32::from_le_bytes(current_window);
+        match magic_number {
+            spec::ZIP64_CENTRAL_DIRECTORY_END_SIGNATURE => {
+                return Err(InvalidArchive("Filename can't contain ZIP64 end signature"));
             }
+            spec::ZIP64_CENTRAL_DIRECTORY_END_LOCATOR_SIGNATURE => {
+                return Err(InvalidArchive(
+                    "Filename can't contain ZIP64 end-locator signature",
+                ));
+            }
+            _ => {}
         }
     }
     Ok(())