mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Guess of a fix at array index out of bounds problem observed in the wild

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1165 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2009-12-22 12:19:31 +00:00
parent 2736b6e19e
commit 18002649eb
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/src/com/google/zxing/qrcode/detector/Detector.java
View file

@ -263,13 +263,13 @@ public class Detector {
// "to" should the be the first value not included, so, the first value off // "to" should the be the first value not included, so, the first value off
// the edge is -1 // the edge is -1
otherToX = -1; otherToX = -1;
} else if (otherToX >= image.getWidth()) { } else if (otherToX > image.getWidth()) {
otherToX = image.getWidth(); otherToX = image.getWidth();
} }
int otherToY = fromY - (toY - fromY); int otherToY = fromY - (toY - fromY);
if (otherToY < 0) { if (otherToY < 0) {
otherToY = -1; otherToY = -1;
} else if (otherToY >= image.getHeight()) { } else if (otherToY > image.getHeight()) {
otherToY = image.getHeight(); otherToY = image.getHeight();
} }
result += sizeOfBlackWhiteBlackRun(fromX, fromY, otherToX, otherToY); result += sizeOfBlackWhiteBlackRun(fromX, fromY, otherToX, otherToY);
@ -326,6 +326,9 @@ public class Detector {
if (error > 0) { if (error > 0) {
y += ystep; y += ystep;
error -= dx; error -= dx;
if (y == toY) {
break;
}
} }
} }
int diffX = toX - fromX; int diffX = toX - fromX;