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

Prevent an array out of bounds exception I noticed in the web logs

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1238 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-03-04 21:15:39 +00:00
parent a44dbd1231
commit d273ab5dbc
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/src/com/google/zxing/pdf417/decoder/BitMatrixParser.java
View file

@ -16,6 +16,7 @@
package com.google.zxing.pdf417.decoder; package com.google.zxing.pdf417.decoder;
import com.google.zxing.FormatException;
import com.google.zxing.NotFoundException; import com.google.zxing.NotFoundException;
import com.google.zxing.common.BitMatrix; import com.google.zxing.common.BitMatrix;
@ -58,7 +59,7 @@ final class BitMatrixParser {
* *
* @return an array of codewords. * @return an array of codewords.
*/ */
int[] readCodewords() { int[] readCodewords() throws FormatException {
int width = bitMatrix.getDimension(); int width = bitMatrix.getDimension();
// TODO should be a rectangular matrix // TODO should be a rectangular matrix
int height = width; int height = width;
@ -183,11 +184,16 @@ final class BitMatrixParser {
* @return the next available index into the codeword array after processing * @return the next available index into the codeword array after processing
* this row. * this row.
*/ */
int processRow(int[] rowCounters, int rowNumber, int rowHeight, int[] codewords, int next) { int processRow(int[] rowCounters, int rowNumber, int rowHeight, int[] codewords, int next)
throws FormatException {
int width = bitMatrix.getDimension(); int width = bitMatrix.getDimension();
int columnNumber = 0; int columnNumber = 0;
long symbol = 0; long symbol = 0;
for (int i = 0; i < width; i += MODULES_IN_SYMBOL) { for (int i = 0; i < width; i += MODULES_IN_SYMBOL) {
// This happens in real life and is almost surely a rare misdecode
if (i + MODULES_IN_SYMBOL > rowCounters.length) {
throw FormatException.getFormatInstance();
}
for (int mask = MODULES_IN_SYMBOL - 1; mask >= 0; mask--) { for (int mask = MODULES_IN_SYMBOL - 1; mask >= 0; mask--) {
if (rowCounters[i + (MODULES_IN_SYMBOL - 1 - mask)] >= rowHeight >>> 1) { if (rowCounters[i + (MODULES_IN_SYMBOL - 1 - mask)] >= rowHeight >>> 1) {
symbol |= 1L << mask; symbol |= 1L << mask;