diff --git a/core/src/com/google/zxing/pdf417/decoder/PDF417ScanningDecoder.java b/core/src/com/google/zxing/pdf417/decoder/PDF417ScanningDecoder.java index be6e44f30..862708304 100644 --- a/core/src/com/google/zxing/pdf417/decoder/PDF417ScanningDecoder.java +++ b/core/src/com/google/zxing/pdf417/decoder/PDF417ScanningDecoder.java @@ -187,10 +187,10 @@ public final class PDF417ScanningDecoder { private static BarcodeMetadata getBarcodeMetadata(DetectionResultRowIndicatorColumn leftRowIndicatorColumn, DetectionResultRowIndicatorColumn rightRowIndicatorColumn) { if (leftRowIndicatorColumn == null || leftRowIndicatorColumn.getBarcodeMetadata() == null) { - return rightRowIndicatorColumn.getBarcodeMetadata(); + return rightRowIndicatorColumn == null ? null : rightRowIndicatorColumn.getBarcodeMetadata(); } if (rightRowIndicatorColumn == null || rightRowIndicatorColumn.getBarcodeMetadata() == null) { - return leftRowIndicatorColumn.getBarcodeMetadata(); + return leftRowIndicatorColumn == null ? null : leftRowIndicatorColumn.getBarcodeMetadata(); } BarcodeMetadata leftBarcodeMetadata = leftRowIndicatorColumn.getBarcodeMetadata(); BarcodeMetadata rightBarcodeMetadata = rightRowIndicatorColumn.getBarcodeMetadata();