ryan/squoosh
1
0
Fork 0
forked from external-repos/squoosh
Code Pull Requests Activity

Merge pull request #476 from jviide/tiling-rust-02

Browse Source 
Fix potential over-the-bounds slicing in rotate.rs introduced in #474
This commit is contained in:
Surma
2019-02-21 14:51:27 +00:00
committed by Surma
parent 88dd0e06c5 0e8c0da3dd
commit 7aff949f47
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
codecs/rotate/rotate.rs
View File

@@ -22,7 +22,7 @@ impl<T> HardUnwrap<T> for Option<T> {
} }
} }
const TILE_SIZE: usize = 16; const TILE_SIZE: usize = 64;
fn get_buffers<'a>(width: usize, height: usize) -> (&'a [u32], &'a mut [u32]) { fn get_buffers<'a>(width: usize, height: usize) -> (&'a [u32], &'a mut [u32]) {
let num_pixels = width * height; let num_pixels = width * height;
@@ -51,10 +51,13 @@ fn rotate_90(width: usize, height: usize) {
for y_start in (0..height).step_by(TILE_SIZE) { for y_start in (0..height).step_by(TILE_SIZE) {
for x_start in (0..width).step_by(TILE_SIZE) { for x_start in (0..width).step_by(TILE_SIZE) {
for y in y_start..(y_start + TILE_SIZE).min(height) { for y in y_start..(y_start + TILE_SIZE).min(height) {
let in_chunk = in_b let in_offset = y * width;
.get((y * width + x_start)..(y * width + x_start + TILE_SIZE)) let in_bounds = if x_start + TILE_SIZE < width {
.unwrap_hard(); (in_offset + x_start)..(in_offset + x_start + TILE_SIZE)
} else {
(in_offset + x_start)..(in_offset + width)
};
let in_chunk = in_b.get(in_bounds).unwrap_hard();
for (x, in_p) in in_chunk.iter().enumerate() { for (x, in_p) in in_chunk.iter().enumerate() {
let new_x = (new_width - 1) - y; let new_x = (new_width - 1) - y;
let new_y = x + x_start; let new_y = x + x_start;
@@ -81,9 +84,13 @@ fn rotate_270(width: usize, height: usize) {
for y_start in (0..height).step_by(TILE_SIZE) { for y_start in (0..height).step_by(TILE_SIZE) {
for x_start in (0..width).step_by(TILE_SIZE) { for x_start in (0..width).step_by(TILE_SIZE) {
for y in y_start..(y_start + TILE_SIZE).min(height) { for y in y_start..(y_start + TILE_SIZE).min(height) {
let in_chunk = in_b let in_offset = y * width;
.get((y * width + x_start)..(y * width + x_start + TILE_SIZE)) let in_bounds = if x_start + TILE_SIZE < width {
.unwrap_hard(); (in_offset + x_start)..(in_offset + x_start + TILE_SIZE)
} else {
(in_offset + x_start)..(in_offset + width)
};
let in_chunk = in_b.get(in_bounds).unwrap_hard();
for (x, in_p) in in_chunk.iter().enumerate() { for (x, in_p) in in_chunk.iter().enumerate() {
let new_x = y; let new_x = y;
let new_y = new_height - 1 - (x_start + x); let new_y = new_height - 1 - (x_start + x);

BIN
codecs/rotate/rotate.wasm
View File

Binary file not shown.