Merge pull request #126 from lovasoa/fix-125

Fix invalid line stride computation causing OOB array accesses

Author: fintelia

CHANGELOG.md

@@ -4,6 +4,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## v0.1.18 (2019-12-10)
+- Fix two bugs causing panics introduced in 0.1.17.
+
 ## v0.1.17 (2019-12-08)
 - Minimum supported rust version changed to 1.34
 - Fix clippy::into_iter_on_array warning

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jpeg-decoder"
-version = "0.1.17"
+version = "0.1.18"
 authors = ["Ulf Nilsson <kaksmet@gmail.com>"]
 description = "JPEG decoder"
 documentation = "https://docs.rs/jpeg-decoder"

src/decoder.rs

@@ -785,10 +785,10 @@ fn compute_image(components: &[Component],
         let height = component.size.height as usize;
 
         let mut buffer = vec![0u8; width * height];
-        let line_stride = width * component.dct_scale;
+        let line_stride = component.block_size.width as usize * component.dct_scale;
 
-        for y in 0 .. width {
-            for x in 0 .. height {
+        for y in 0 .. height {
+            for x in 0 .. width {
                 buffer[y * width + x] = data[0][y * line_stride + x];
             }
         }