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

Tweaked Java BitBuffer code to add size overflow checks.

This commit is contained in:
Project Nayuki 2018-08-22 18:03:17 +00:00
parent cc939b2ebe
commit b756fcd8b1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,10 +94,14 @@ public final class BitBuffer implements Cloneable {
* to this sequence. Requires 0 &le; val &lt; 2<sup>len</sup>. * to this sequence. Requires 0 &le; val &lt; 2<sup>len</sup>.
* @param val the value to append * @param val the value to append
* @param len the number of low bits in the value to take * @param len the number of low bits in the value to take
* @throws IllegalStateException if appending the data
* would make bitLength exceed Integer.MAX_VALUE
*/ */
public void appendBits(int val, int len) { public void appendBits(int val, int len) {
if (len < 0 || len > 31 || val >>> len != 0) if (len < 0 || len > 31 || val >>> len != 0)
throw new IllegalArgumentException("Value out of range"); throw new IllegalArgumentException("Value out of range");
if (Integer.MAX_VALUE - bitLength < len)
throw new IllegalStateException("Maximum length reached");
for (int i = len - 1; i >= 0; i--, bitLength++) // Append bit by bit for (int i = len - 1; i >= 0; i--, bitLength++) // Append bit by bit
data.set(bitLength, QrCode.getBit(val, i)); data.set(bitLength, QrCode.getBit(val, i));
} }
@ -107,10 +111,14 @@ public final class BitBuffer implements Cloneable {
* Appends the bit data of the specified segment to this bit buffer. * Appends the bit data of the specified segment to this bit buffer.
* @param seg the segment whose data to append (not {@code null}) * @param seg the segment whose data to append (not {@code null})
* @throws NullPointerException if the segment is {@code null} * @throws NullPointerException if the segment is {@code null}
* @throws IllegalStateException if appending the data
* would make bitLength exceed Integer.MAX_VALUE
*/ */
public void appendData(QrSegment seg) { public void appendData(QrSegment seg) {
Objects.requireNonNull(seg); Objects.requireNonNull(seg);
BitBuffer bb = seg.data; BitBuffer bb = seg.data;
if (Integer.MAX_VALUE - bitLength < bb.bitLength)
throw new IllegalStateException("Maximum length reached");
for (int i = 0; i < bb.bitLength; i++, bitLength++) // Append bit by bit for (int i = 0; i < bb.bitLength; i++, bitLength++) // Append bit by bit
data.set(bitLength, bb.data.get(i)); data.set(bitLength, bb.data.get(i));
} }