From f46a0055ade0a045f4fe4b8a71ad1c7fe019a171 Mon Sep 17 00:00:00 2001
From: Chris Hennick <hennickc@amazon.com>
Date: Sat, 27 May 2023 17:04:27 -0700
Subject: [PATCH] Bug fixes and refactors for Arbitrary impl

---
 src/write.rs | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/write.rs b/src/write.rs
index 8555658a..8fe8d8ee 100644
--- a/src/write.rs
+++ b/src/write.rs
@@ -167,15 +167,26 @@ impl arbitrary::Arbitrary<'_> for FileOptions {
             #[cfg(feature = "deflate-zopfli")]
             zopfli_buffer_size: None,
         };
-        if options.compression_method == Deflated {
-            options.compression_level = Some(u.int_in_range(0..=265)?);
-            if options.compression_level > Compression::best().level() {
-                options.zopfli_buffer_size = Some(1 << u.int_in_range(9..=30)?);
+        match options.compression_method {
+            Deflated => {
+                if bool::arbitrary(u)? {
+                    let level = u.int_in_range(0..=265)?;
+                    options.compression_level = Some(level);
+                    if level > Compression::best().level() {
+                        options.zopfli_buffer_size = Some(1 << u.int_in_range(9..=30)?);
+                    }
+                }
+            },
+            Stored => {
+                if bool::arbitrary(u)? {
+                    options.compression_level = Some(1);
+                }
+            },
+            _ => {
+                if bool::arbitrary(u)? {
+                    options.compression_level = Some(u.int_in_range(0..=10)?);
+                }
             }
-        } else if options.compression_method != Stored {
-            options.compression_level = Some(u.int_in_range(0..=10)?);
-        } else if bool::arbitrary(u)? {
-            options.compression_level = Some(1);
         }
         u.arbitrary_loop(Some(0), Some((u16::MAX / 4) as u32), |u| {
             options