Merge pull request #41 from aschampion/issues/39

Fix roundtrip bug
image-rs · Jan 23, 2020 · 999771d · 999771d
2 parents 154bece + 3d90924
commit 999771d
Show file tree

Hide file tree

Showing 45 changed files with 19 additions and 1 deletion.
diff --git a/src/lz77.rs b/src/lz77.rs
@@ -468,7 +468,7 @@ fn process_chunk_lazy(
                 state.add = false;
 
                 // ADD
-                write_literal!(writer, state.prev_byte, position + 1);
+                write_literal!(writer, state.prev_byte, position);
             };
 
             // We are at the last two bytes we want to add, so there is no point

diff --git a/tests/afl/default/id_000000,sig_06,src_000831,op_havoc,rep_64 b/tests/afl/default/id_000000,sig_06,src_000831,op_havoc,rep_64
diff --git a/tests/afl/default/id_000001,sig_06,src_000891,op_havoc,rep_8 b/tests/afl/default/id_000001,sig_06,src_000891,op_havoc,rep_8
diff --git a/tests/afl/default/id_000002,sig_06,src_000891,op_havoc,rep_8 b/tests/afl/default/id_000002,sig_06,src_000891,op_havoc,rep_8
diff --git a/tests/afl/default/id_000003,sig_06,src_000891,op_havoc,rep_16 b/tests/afl/default/id_000003,sig_06,src_000891,op_havoc,rep_16
diff --git a/tests/afl/default/id_000007,sig_06,src_001004,op_flip1,pos_15 b/tests/afl/default/id_000007,sig_06,src_001004,op_flip1,pos_15
diff --git a/tests/afl/default/id_000008,sig_06,src_001004,op_flip1,pos_15 b/tests/afl/default/id_000008,sig_06,src_001004,op_flip1,pos_15
diff --git a/tests/afl/default/id_000009,sig_06,src_001004,op_flip1,pos_238 b/tests/afl/default/id_000009,sig_06,src_001004,op_flip1,pos_238
diff --git a/tests/afl/default/id_000010,sig_06,src_001004,op_flip1,pos_554 b/tests/afl/default/id_000010,sig_06,src_001004,op_flip1,pos_554
diff --git a/tests/afl/default/id_000011,sig_06,src_001004,op_flip1,pos_1954 b/tests/afl/default/id_000011,sig_06,src_001004,op_flip1,pos_1954
diff --git a/tests/afl/default/id_000012,sig_06,src_001004,op_flip1,pos_1955 b/tests/afl/default/id_000012,sig_06,src_001004,op_flip1,pos_1955
diff --git a/tests/afl/default/id_000013,sig_06,src_001004,op_flip1,pos_1958 b/tests/afl/default/id_000013,sig_06,src_001004,op_flip1,pos_1958
diff --git a/tests/afl/default/id_000014,sig_06,src_001004,op_flip1,pos_1963 b/tests/afl/default/id_000014,sig_06,src_001004,op_flip1,pos_1963
diff --git a/tests/afl/default/id_000015,sig_06,src_001004,op_flip1,pos_6662 b/tests/afl/default/id_000015,sig_06,src_001004,op_flip1,pos_6662
diff --git a/tests/afl/default/id_000016,sig_06,src_001004,op_flip1,pos_15144 b/tests/afl/default/id_000016,sig_06,src_001004,op_flip1,pos_15144
diff --git a/tests/afl/default/id_000017,sig_06,src_001004,op_flip1,pos_15321 b/tests/afl/default/id_000017,sig_06,src_001004,op_flip1,pos_15321
diff --git a/tests/afl/default/id_000018,sig_06,src_001004,op_flip1,pos_16334 b/tests/afl/default/id_000018,sig_06,src_001004,op_flip1,pos_16334
diff --git a/tests/afl/default/id_000019,sig_06,src_001004,op_flip1,pos_17475 b/tests/afl/default/id_000019,sig_06,src_001004,op_flip1,pos_17475
diff --git a/tests/afl/default/id_000020,sig_06,src_001004,op_flip1,pos_18334 b/tests/afl/default/id_000020,sig_06,src_001004,op_flip1,pos_18334
diff --git a/tests/afl/default/id_000021,sig_06,src_001004,op_flip1,pos_20365 b/tests/afl/default/id_000021,sig_06,src_001004,op_flip1,pos_20365
diff --git a/tests/afl/default/id_000022,sig_06,src_001004,op_flip1,pos_20500 b/tests/afl/default/id_000022,sig_06,src_001004,op_flip1,pos_20500
diff --git a/tests/afl/default/id_000023,sig_06,src_001004,op_flip1,pos_20513 b/tests/afl/default/id_000023,sig_06,src_001004,op_flip1,pos_20513
diff --git a/tests/afl/default/id_000024,sig_06,src_001004,op_flip1,pos_20518 b/tests/afl/default/id_000024,sig_06,src_001004,op_flip1,pos_20518
diff --git a/tests/afl/default/id_000025,sig_06,src_001004,op_flip1,pos_20521 b/tests/afl/default/id_000025,sig_06,src_001004,op_flip1,pos_20521
diff --git a/tests/afl/default/id_000026,sig_06,src_001004,op_flip1,pos_20522 b/tests/afl/default/id_000026,sig_06,src_001004,op_flip1,pos_20522
diff --git a/tests/afl/default/id_000027,sig_06,src_001004,op_flip1,pos_20525 b/tests/afl/default/id_000027,sig_06,src_001004,op_flip1,pos_20525
diff --git a/tests/afl/default/id_000028,sig_06,src_001004,op_flip1,pos_20527 b/tests/afl/default/id_000028,sig_06,src_001004,op_flip1,pos_20527
diff --git a/tests/afl/default/id_000029,sig_06,src_001004,op_flip1,pos_20550 b/tests/afl/default/id_000029,sig_06,src_001004,op_flip1,pos_20550
diff --git a/tests/afl/default/id_000030,sig_06,src_001004,op_flip1,pos_25139 b/tests/afl/default/id_000030,sig_06,src_001004,op_flip1,pos_25139
diff --git a/tests/afl/default/id_000031,sig_06,src_001004,op_flip1,pos_25204 b/tests/afl/default/id_000031,sig_06,src_001004,op_flip1,pos_25204
diff --git a/tests/afl/default/id_000032,sig_06,src_001004,op_flip1,pos_32259 b/tests/afl/default/id_000032,sig_06,src_001004,op_flip1,pos_32259
diff --git a/tests/afl/default/id_000033,sig_06,src_001004,op_flip1,pos_44443 b/tests/afl/default/id_000033,sig_06,src_001004,op_flip1,pos_44443
diff --git a/tests/afl/default/id_000034,sig_06,src_001004,op_flip1,pos_50703 b/tests/afl/default/id_000034,sig_06,src_001004,op_flip1,pos_50703
diff --git a/tests/afl/default/id_000035,sig_06,src_001004,op_flip1,pos_57865 b/tests/afl/default/id_000035,sig_06,src_001004,op_flip1,pos_57865
diff --git a/tests/afl/default/id_000036,sig_06,src_001004,op_flip1,pos_63260 b/tests/afl/default/id_000036,sig_06,src_001004,op_flip1,pos_63260
diff --git a/tests/afl/default/id_000037,sig_06,src_001004,op_flip2,pos_40352 b/tests/afl/default/id_000037,sig_06,src_001004,op_flip2,pos_40352
diff --git a/tests/afl/default/id_000038,sig_06,src_001004,op_arith8,pos_15330,val_-31 b/tests/afl/default/id_000038,sig_06,src_001004,op_arith8,pos_15330,val_-31
diff --git a/tests/afl/default/id_000039,sig_06,src_001004,op_arith8,pos_32239,val_-30 b/tests/afl/default/id_000039,sig_06,src_001004,op_arith8,pos_32239,val_-30
diff --git a/tests/afl/default/id_000040,sig_06,src_001004,op_int32,pos_10338,val_be_+512 b/tests/afl/default/id_000040,sig_06,src_001004,op_int32,pos_10338,val_be_+512
diff --git a/tests/afl/default/id_000041,sig_06,src_001004,op_int32,pos_20438,val_be_+1 b/tests/afl/default/id_000041,sig_06,src_001004,op_int32,pos_20438,val_be_+1
diff --git a/tests/afl/default/id_000042,sig_06,src_001004,op_int32,pos_23295,val_+100 b/tests/afl/default/id_000042,sig_06,src_001004,op_int32,pos_23295,val_+100
diff --git a/tests/afl/default/id_000043,sig_06,src_001004,op_int32,pos_25214,val_+16 b/tests/afl/default/id_000043,sig_06,src_001004,op_int32,pos_25214,val_+16
diff --git a/tests/afl/default/id_000044,sig_06,src_001004,op_ext_AO,pos_55585 b/tests/afl/default/id_000044,sig_06,src_001004,op_ext_AO,pos_55585
diff --git a/tests/afl/default/id_000045,sig_06,src_001006,op_havoc,rep_8 b/tests/afl/default/id_000045,sig_06,src_001006,op_havoc,rep_8
diff --git a/tests/test.rs b/tests/test.rs
@@ -124,5 +124,23 @@ fn issue_26_gzip() {
 fn issue_18_201911() {
     let test_file = "tests/issue_18_201911.bin";
     let test_data = get_test_file_data(test_file);
+    // This was the failing compression mode.
     roundtrip_conf(&test_data, deflate::Compression::Fast.into());
+    roundtrip_conf(&test_data, CompressionOptions::default());
+}
+
+#[test]
+fn afl_regressions_default_compression() {
+    for entry in std::fs::read_dir("tests/afl/default").unwrap() {
+        let entry = entry.unwrap();
+        let test_file = entry.path();
+        if test_file.is_file() {
+            let test_filename = test_file.to_str().unwrap();
+            println!("{}", test_filename);
+            let test_data = get_test_file_data(test_filename);
+            // This was the failing compression mode.
+            roundtrip_conf(&test_data, CompressionOptions::default());
+            roundtrip_conf(&test_data, deflate::Compression::Fast.into());
+        }
+    }
 }