status-im
/
QR-Code-generator
mirror of https://github.com/status-im/QR-Code-generator.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed QrSegment.getTotalBits() Java logic to catch integer overflow correctly (related to the C++ fix in commit 873652a82f).

This commit is contained in:
Project Nayuki 2017-04-21 15:37:59 +00:00
parent 407816ea49
commit ac91c54ce1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/io/nayuki/qrcodegen/QrSegment.java
View File

@ -189,16 +189,18 @@ public final class QrSegment {
if (version < 1 || version > 40) if (version < 1 || version > 40)
throw new IllegalArgumentException("Version number out of range"); throw new IllegalArgumentException("Version number out of range");
int result = 0; long result = 0;
for (QrSegment seg : segs) { for (QrSegment seg : segs) {
Objects.requireNonNull(seg); Objects.requireNonNull(seg);
int ccbits = seg.mode.numCharCountBits(version); int ccbits = seg.mode.numCharCountBits(version);
// Fail if segment length value doesn't fit in the length field's bit-width // Fail if segment length value doesn't fit in the length field's bit-width
if (seg.numChars >= (1 << ccbits)) if (seg.numChars >= (1 << ccbits))
return -1; return -1;
result += 4 + ccbits + seg.bitLength; result += 4L + ccbits + seg.bitLength;
if (result > Integer.MAX_VALUE)
return -1;
} }
return result; return (int)result;
} }