From 2974bbbee377933872c64c78dd31fcfc1ce0189a Mon Sep 17 00:00:00 2001
From: Joshua Holmer <holmerj@uindy.edu>
Date: Mon, 4 Apr 2016 11:06:00 -0400
Subject: [PATCH] Fix issue with very small images [ci skip]

---
 src/deflate/deflate.rs      |   7 +++++--
 tests/files/small_files.png | Bin 0 -> 3586 bytes
 tests/interlaced.rs         |   2 +-
 tests/reduction.rs          |  15 +++++++++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 tests/files/small_files.png

diff --git a/src/deflate/deflate.rs b/src/deflate/deflate.rs
index 14ddf550..312b3a33 100644
--- a/src/deflate/deflate.rs
+++ b/src/deflate/deflate.rs
@@ -1,5 +1,6 @@
 use libz_sys;
 use libc::c_int;
+use std::cmp::max;
 
 /// Decompress a data stream using the DEFLATE algorithm
 pub fn inflate(data: &[u8]) -> Result<Vec<u8>, String> {
@@ -25,10 +26,12 @@ pub fn deflate(data: &[u8], zc: u8, zm: u8, zs: u8, zw: u8) -> Result<Vec<u8>, S
                                                          zw as c_int,
                                                          zm as c_int,
                                                          zs as c_int);
-    let mut output = Vec::with_capacity(data.len() / 20);
+    // Compressed input should be smaller than decompressed, so allocate less than data.len()
+    // However, it needs a minimum capacity in order to handle very small images
+    let mut output = Vec::with_capacity(max(1024, data.len() / 20));
     loop {
         match stream.compress_vec(input.as_mut(), output.as_mut()) {
-            libz_sys::Z_OK => output.reserve(data.len() / 20),
+            libz_sys::Z_OK => output.reserve(max(1024, data.len() / 20)),
             libz_sys::Z_STREAM_END => break,
             c => return Err(format!("Error code on compress: {}", c)),
         }
diff --git a/tests/files/small_files.png b/tests/files/small_files.png
new file mode 100644
index 0000000000000000000000000000000000000000..576b88c9af735c88ab6203999c8cab06f0261363
GIT binary patch
literal 3586
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
A{Qv*}

literal 0
HcmV?d00001

diff --git a/tests/interlaced.rs b/tests/interlaced.rs
index 5c24cad6..57df44e6 100644
--- a/tests/interlaced.rs
+++ b/tests/interlaced.rs
@@ -1272,5 +1272,5 @@ fn interlaced_small_files() {
                      png::ColorType::Indexed,
                      png::BitDepth::Eight,
                      png::ColorType::Indexed,
-                     png::BitDepth::Two);
+                     png::BitDepth::One);
 }
diff --git a/tests/reduction.rs b/tests/reduction.rs
index d7a35033..68704325 100644
--- a/tests/reduction.rs
+++ b/tests/reduction.rs
@@ -1259,3 +1259,18 @@ fn grayscale_8_should_be_palette_1() {
                      png::ColorType::Indexed,
                      png::BitDepth::One);
 }
+
+#[test]
+fn small_files() {
+    let input = PathBuf::from("tests/files/small_files.png");
+    let opts = get_opts(&input);
+    let output = opts.out_file.clone();
+
+    test_it_converts(&input,
+                     &output,
+                     &opts,
+                     png::ColorType::Indexed,
+                     png::BitDepth::Eight,
+                     png::ColorType::Indexed,
+                     png::BitDepth::One);
+}