Possible fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?i…

…d=38486#c10
317394245 · Sep 24, 2022 · fa19d47 · fa19d47
1 parent a6273e3
commit fa19d47
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/core/src/main/java/com/google/zxing/pdf417/decoder/DecodedBitStreamParser.java b/core/src/main/java/com/google/zxing/pdf417/decoder/DecodedBitStreamParser.java
@@ -220,22 +220,38 @@ static int decodeMacroBlock(int[] codewords, int codeIndex, PDF417ResultMetadata
             case MACRO_PDF417_OPTIONAL_FIELD_SEGMENT_COUNT:
               ECIStringBuilder segmentCount = new ECIStringBuilder();
               codeIndex = numericCompaction(codewords, codeIndex + 1, segmentCount);
-              resultMetadata.setSegmentCount(Integer.parseInt(segmentCount.toString()));
+              try {
+                resultMetadata.setSegmentCount(Integer.parseInt(segmentCount.toString()));
+              } catch (NumberFormatException nfe) {
+                throw FormatException.getFormatInstance();
+              }
               break;
             case MACRO_PDF417_OPTIONAL_FIELD_TIME_STAMP:
               ECIStringBuilder timestamp = new ECIStringBuilder();
               codeIndex = numericCompaction(codewords, codeIndex + 1, timestamp);
-              resultMetadata.setTimestamp(Long.parseLong(timestamp.toString()));
+              try {
+                resultMetadata.setTimestamp(Long.parseLong(timestamp.toString()));
+              } catch (NumberFormatException nfe) {
+                throw FormatException.getFormatInstance();
+              }
               break;
             case MACRO_PDF417_OPTIONAL_FIELD_CHECKSUM:
               ECIStringBuilder checksum = new ECIStringBuilder();
               codeIndex = numericCompaction(codewords, codeIndex + 1, checksum);
-              resultMetadata.setChecksum(Integer.parseInt(checksum.toString()));
+              try {
+                resultMetadata.setChecksum(Integer.parseInt(checksum.toString()));
+              } catch (NumberFormatException nfe) {
+                throw FormatException.getFormatInstance();
+              }
               break;
             case MACRO_PDF417_OPTIONAL_FIELD_FILE_SIZE:
               ECIStringBuilder fileSize = new ECIStringBuilder();
               codeIndex = numericCompaction(codewords, codeIndex + 1, fileSize);
-              resultMetadata.setFileSize(Long.parseLong(fileSize.toString()));
+              try {
+                resultMetadata.setFileSize(Long.parseLong(fileSize.toString()));
+              } catch (NumberFormatException nfe) {
+                throw FormatException.getFormatInstance();
+              }
               break;
             default:
               throw FormatException.getFormatInstance();