From a9aaea306e052932d1a23e97feb676a202c07d28 Mon Sep 17 00:00:00 2001
From: Chris Hennick <hennickc@amazon.com>
Date: Mon, 1 May 2023 13:02:52 -0700
Subject: [PATCH] Make large files more likely

---
 .github/workflows/ci.yaml       |  2 +-
 fuzz/fuzz_targets/fuzz_write.rs | 26 ++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 14337205..f01ab679 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -109,4 +109,4 @@ jobs:
           cargo fuzz build fuzz_write
       - name: run fuzz
         run: |
-          cargo fuzz run fuzz_write -- -timeout=1s -runs=1000000 -max_len=5000000000
+          cargo fuzz run fuzz_write -- -timeout=1s -runs=1000000 -max_len=15000000000
diff --git a/fuzz/fuzz_targets/fuzz_write.rs b/fuzz/fuzz_targets/fuzz_write.rs
index 7ad45b5b..2c3bdc70 100644
--- a/fuzz/fuzz_targets/fuzz_write.rs
+++ b/fuzz/fuzz_targets/fuzz_write.rs
@@ -1,7 +1,8 @@
 #![no_main]
 
 use libfuzzer_sys::fuzz_target;
-use arbitrary::Arbitrary;
+use arbitrary::{Arbitrary, Unstructured};
+use arbitrary::size_hint::and_all;
 use std::fmt::{Debug, Formatter};
 use std::io::{Cursor, Read, Seek, Write};
 
@@ -11,13 +12,30 @@ pub struct File {
     pub contents: Vec<Vec<u8>>
 }
 
-#[derive(Arbitrary)]
+const LARGE_FILE_BUF_SIZE: usize = u32::MAX as usize + 1;
+
 pub struct LargeFile {
     pub name: String,
-    pub large_contents: [u8; u32::MAX as usize + 1],
+    pub large_contents: Vec<u8>,
     pub extra_contents: Vec<Vec<u8>>
 }
 
+impl Arbitrary<'_> for LargeFile {
+    fn arbitrary(u: &mut Unstructured) -> arbitrary::Result<Self> {
+        Ok(LargeFile {
+            name: String::arbitrary(u)?,
+            large_contents: u.bytes(LARGE_FILE_BUF_SIZE)?.to_vec(),
+            extra_contents: Vec::arbitrary(u)?
+        })
+    }
+
+    fn size_hint(depth: usize) -> (usize, Option<usize>) {
+        and_all(&[<String as Arbitrary>::size_hint(depth),
+                           <Vec<Vec<u8>> as Arbitrary>::size_hint(depth),
+                           (LARGE_FILE_BUF_SIZE, Some(LARGE_FILE_BUF_SIZE))])
+    }
+}
+
 impl Debug for LargeFile {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("LargeFile")
@@ -74,7 +92,7 @@ fn do_operation<T>(writer: &mut zip_next::ZipWriter<T>,
         FileOperation::WriteLarge {file, mut options} => {
             options = options.large_file(true);
             writer.start_file(file.name.to_owned(), options)?;
-            writer.write_all(&file.large_contents)?;
+            writer.write_all(&*file.large_contents)?;
             for chunk in &file.extra_contents {
                 writer.write_all(chunk.as_slice())?;
             }