ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-26 04:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29 from Olssdani/fix_out_of_bound_index

Browse Source 
Fixed crash because of out of bound indices for MaxiCode.
This commit is contained in:
Henry A Schimke
2023-03-21 09:46:59 -05:00
committed by GitHub
parent 33ea52c3f7 8eaabb1c90
commit 94d07a1b65
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/bit_matrix.rs
View File

@@ -255,7 +255,7 @@ impl BitMatrix {
/// Confusingly returns true if the requested element is out of bounds /// Confusingly returns true if the requested element is out of bounds
pub fn check_in_bounds(&self, x: u32, y: u32) -> bool { pub fn check_in_bounds(&self, x: u32, y: u32) -> bool {
(self.get_offset(y, x)) > self.bits.len() (self.get_offset(y, x)) >= self.bits.len()
} }
/** /**

7
src/maxicode/detector.rs
View File

@@ -281,7 +281,9 @@ impl Circle<'_> {
// count left // count left
while { while {
let point = get_point(self.center, (x, y), rotation); let point = get_point(self.center, (x, y), rotation);
!self.image.get(point.x as u32, point.y as u32) && x > 0 !self.image.check_in_bounds(point.x as u32, point.y as u32)
&& !self.image.get(point.x as u32, point.y as u32)
&& x > 0
} { } {
x -= 1; x -= 1;
length += 1; length += 1;
@@ -293,7 +295,8 @@ impl Circle<'_> {
// count right // count right
while { while {
let point = get_point(self.center, (x, y), rotation); let point = get_point(self.center, (x, y), rotation);
!self.image.get(point.x as u32, point.y as u32) !self.image.check_in_bounds(point.x as u32, point.y as u32)
&& !self.image.get(point.x as u32, point.y as u32)
} { } {
x += 1; x += 1;
length += 1; length += 1;