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

Fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38010

Browse source
This commit is contained in:
Sean Owen 2021-09-02 09:27:41 -05:00
parent 6bcae2e5ea
commit 5b0036446e
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/com/google/zxing/aztec/decoder/Decoder.java
View file

@ -183,6 +183,9 @@ public final class Decoder {
eci = eci * 10 + (nextDigit - 2); eci = eci * 10 + (nextDigit - 2);
} }
CharacterSetECI charsetECI = CharacterSetECI.getCharacterSetECIByValue(eci); CharacterSetECI charsetECI = CharacterSetECI.getCharacterSetECIByValue(eci);
if (charsetECI == null) {
throw FormatException.getFormatInstance();
}
encoding = charsetECI.getCharset(); encoding = charsetECI.getCharset();
} }
// Go back to whatever mode we had been in // Go back to whatever mode we had been in

3
core/src/main/java/com/google/zxing/pdf417/decoder/DecodedBitStreamParser.java
View file

@ -126,6 +126,9 @@ final class DecodedBitStreamParser {
case ECI_CHARSET: case ECI_CHARSET:
CharacterSetECI charsetECI = CharacterSetECI charsetECI =
CharacterSetECI.getCharacterSetECIByValue(codewords[codeIndex++]); CharacterSetECI.getCharacterSetECIByValue(codewords[codeIndex++]);
if (charsetECI == null) {
throw FormatException.getFormatInstance();
}
encoding = charsetECI.getCharset(); encoding = charsetECI.getCharset();
break; break;
case ECI_GENERAL_PURPOSE: case ECI_GENERAL_PURPOSE: