itext
diff --git a/‎barcodes/pom.xml
Lines changed: 1 addition & 6 deletions b/‎barcodes/pom.xml
Lines changed: 1 addition & 6 deletions
diff --git a/‎barcodes/src/main/java/com/itextpdf/barcodes/BarcodeDataMatrix.java
Lines changed: 57 additions & 49 deletions b/‎barcodes/src/main/java/com/itextpdf/barcodes/BarcodeDataMatrix.java
Lines changed: 57 additions & 49 deletions
diff --git a/‎barcodes/src/main/java/com/itextpdf/barcodes/dmcode/Placement.java
Lines changed: 19 additions & 18 deletions b/‎barcodes/src/main/java/com/itextpdf/barcodes/dmcode/Placement.java
Lines changed: 19 additions & 18 deletions
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.1.2</version>
+    <version>7.1.3</version>
   </parent>
-
   <artifactId>barcodes</artifactId>
-
   <name>iText 7 - barcodes</name>
   <url>http://itextpdf.com/</url>
-
   <dependencies>
     <dependency>
       <groupId>com.itextpdf</groupId>
@@ -26,7 +22,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
   <build>
     <plugins>
       <plugin>
 
@@ -218,9 +218,9 @@ public PdfFormXObject createFormXObject(Color foreground, PdfDocument document)
     /**
      * Creates a PdfFormXObject with the barcode with given module width and module height.
      *
-     * @param foreground    The color of the pixels. It can be <CODE>null</CODE>
-     * @param moduleSide    The side (width and height) of the pixels.
-     * @param document      The document
+     * @param foreground The color of the pixels. It can be <CODE>null</CODE>
+     * @param moduleSide The side (width and height) of the pixels.
+     * @param document   The document
      * @return the XObject.
      */
     public PdfFormXObject createFormXObject(Color foreground, float moduleSide, PdfDocument document) {
@@ -296,8 +296,8 @@ public java.awt.Image createAwtImage(java.awt.Color foreground, java.awt.Color b
 
     /**
      * Gets the barcode size
-     * @param moduleHeight  The height of the module
-     * @param moduleWidth   The width of the module
+     * @param moduleHeight The height of the module
+     * @param moduleWidth  The width of the module
      * @return The size of the barcode
      */
     public Rectangle getBarcodeSize(float moduleHeight, float moduleWidth) {
@@ -339,6 +339,12 @@ public int setCode(String text) {
      * <CODE>DM_ERROR_EXTENSION</CODE> - an error was while parsing an extension.
      */
     public int setCode(byte[] text, int textOffset, int textSize) {
+        if (textOffset < 0) {
+            throw new IndexOutOfBoundsException("" + textOffset);
+        }
+        if (textOffset + textSize > text.length || textSize < 0) {
+            throw new IndexOutOfBoundsException("" + textSize);
+        }
         int extCount, e, k, full;
         DmParams dm, last;
         byte[] data = new byte[2500];
@@ -402,24 +408,25 @@ public int getHeight() {
     }
 
     /**
-     * Sets the height of the barcode. If the height is zero it will be calculated. This height doesn't include the whitespace border, if any.
+     * Sets the height of the barcode. If the height is zero it will be calculated.
+     * This height doesn't include the whitespace border, if any.
      *
-     * The allowed dimensions are (height, width):<p>
+     * The allowed dimensions are (width, height):<p>
      * 10, 10<br>
      * 12, 12<br>
-     * 8, 18<br>
+     * 18, 8<br>
      * 14, 14<br>
-     * 8, 32<br>
+     * 32, 8<br>
      * 16, 16<br>
-     * 12, 26<br>
+     * 26, 12<br>
      * 18, 18<br>
      * 20, 20<br>
-     * 12, 36<br>
+     * 36, 12<br>
      * 22, 22<br>
-     * 16, 36<br>
+     * 36, 16<br>
      * 24, 24<br>
      * 26, 26<br>
-     * 16, 48<br>
+     * 48, 16<br>
      * 32, 32<br>
      * 36, 36<br>
      * 40, 40<br>
@@ -453,24 +460,25 @@ public int getWidth() {
     }
 
     /**
-     * Sets the width of the barcode. If the width is zero it will be calculated. This width doesn't include the whitespace border, if any.
+     * Sets the width of the barcode. If the width is zero it will be calculated.
+     * This width doesn't include the whitespace border, if any.
      *
-     * The allowed dimensions are (height, width):<p>
+     * The allowed dimensions are (width, height):<p>
      * 10, 10<br>
      * 12, 12<br>
-     * 8, 18<br>
+     * 18, 8<br>
      * 14, 14<br>
-     * 8, 32<br>
+     * 32, 8<br>
      * 16, 16<br>
-     * 12, 26<br>
+     * 26, 12<br>
      * 18, 18<br>
      * 20, 20<br>
-     * 12, 36<br>
+     * 36, 12<br>
      * 22, 22<br>
-     * 16, 36<br>
+     * 36, 16<br>
      * 24, 24<br>
      * 26, 26<br>
-     * 16, 48<br>
+     * 48, 16<br>
      * 32, 32<br>
      * 36, 36<br>
      * 40, 40<br>
@@ -1072,7 +1080,7 @@ private int C40OrTextEncodation(byte[] text, int textOffset, int textLength, byt
                         if (j == 1)
                             dataOffsetNew = requiredCapacityForASCII;
                     }
-                    addLatch = unlatch < 0 ? true : (dataOffset - requiredCapacityForASCII != unlatch);
+                    addLatch = (unlatch < 0) || ((dataOffset - requiredCapacityForASCII) != unlatch);
                     if (requiredCapacityForC40orText % 3 == 0 &&
                             requiredCapacityForC40orText / 3 * 2 + (addLatch ? 2 : 0) < requiredCapacityForASCII) {
                         usingASCII = false;
@@ -1086,15 +1094,17 @@ private int C40OrTextEncodation(byte[] text, int textOffset, int textLength, byt
                         i--;
                 }
             }
-        } else if (symbolIndex != -1)
+        } else if (symbolIndex != -1) {
             usingASCII = true;
-        if (usingASCII)
+        }
+        if (dataOffset < 0) {
+            return -1;
+        }
+        if (usingASCII) {
             return asciiEncodation(text, textOffset, 1, data, dataOffset, dataLength, prevEnc == mode ? 1 : -1, DM_ASCII, origDataOffset);
+        }
         if (addLatch) {
-            if (c40)
-                data[dataOffset + ptrOut++] = LATCH_C40;
-            else
-                data[dataOffset + ptrOut++] = LATCH_TEXT;
+            data[dataOffset + ptrOut++] = c40 ? LATCH_C40 : LATCH_TEXT;
         }
         int[] enc = new int[textLength * 4 + 10];
         encPtr = 0;
@@ -1197,7 +1207,7 @@ private void draw(byte[] data, int dataSize, DmParams dm) {
     private static int minValueInColumn(int[][] array, int column) {
         int min = Integer.MAX_VALUE;
         for (int i = 0; i < 6; i++)
-            if (array[i][column] < min && array[i][column]  >= 0)
+            if (array[i][column] < min && array[i][column] >= 0)
                 min = array[i][column];
         return min != Integer.MAX_VALUE ? min : -1;
     }
@@ -1246,29 +1256,28 @@ private int getEncodation(byte[] text, int textOffset, int textSize, byte[] data
             f[3][0] = b256Encodation(text, textOffset, 1, dataDynamic[3], dataOffset, dataSize, 0, -1, dataOffset);
             f[4][0] = X12Encodation(text, textOffset, 1, dataDynamic[4], dataOffset, dataSize, 0, -1, dataOffset);
             f[5][0] = EdifactEncodation(text, textOffset, 1, dataDynamic[5], dataOffset, dataSize, 0, -1, dataOffset, sizeFixed);
-            int[] dataNewOffset = new int[6];
             for (int i = 1; i < textSize; i++) {
                 int tempForMin[] = new int[6];
-                for (int k = 0; k < 6; k++) {
-                    dataNewOffset[k] = f[k][i - 1] >= 0 ? f[k][i - 1] : Integer.MAX_VALUE;
-                }
                 for (int currEnc = 0; currEnc < 6; currEnc++) {
                     byte[][] dataDynamicInner = new byte[6][data.length];
                     for (int prevEnc = 0; prevEnc < 6; prevEnc++) {
                         System.arraycopy(dataDynamic[prevEnc], 0, dataDynamicInner[prevEnc], 0, data.length);
-                        if (currEnc == 0)
-                            tempForMin[prevEnc] = asciiEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], dataNewOffset[prevEnc] + dataOffset, dataSize - dataNewOffset[prevEnc], i, prevEnc + 1, dataOffset);
-                        if (currEnc == 1)
-                            tempForMin[prevEnc] = C40OrTextEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], dataNewOffset[prevEnc] + dataOffset, dataSize - dataNewOffset[prevEnc], true, i, prevEnc + 1, dataOffset);
-                        if (currEnc == 2)
-                            tempForMin[prevEnc] = C40OrTextEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], dataNewOffset[prevEnc] + dataOffset, dataSize - dataNewOffset[prevEnc], false, i, prevEnc + 1, dataOffset);
-                        if (currEnc == 3)
-                            tempForMin[prevEnc] = b256Encodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], dataNewOffset[prevEnc] + dataOffset, dataSize - dataNewOffset[prevEnc], i, prevEnc + 1, dataOffset);
-                        if (currEnc == 4)
-                            tempForMin[prevEnc] = X12Encodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], dataNewOffset[prevEnc] + dataOffset, dataSize - dataNewOffset[prevEnc], i, prevEnc + 1, dataOffset);
-                        if (currEnc == 5)
-                            tempForMin[prevEnc] = EdifactEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], dataNewOffset[prevEnc] + dataOffset, dataSize - dataNewOffset[prevEnc], i, prevEnc + 1, dataOffset, sizeFixed);
-
+                        if (f[prevEnc][i - 1] < 0)
+                            tempForMin[prevEnc] = -1;
+                        else {
+                            if (currEnc == 0)
+                                tempForMin[prevEnc] = asciiEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], f[prevEnc][i - 1] + dataOffset, dataSize - f[prevEnc][i - 1], i, prevEnc + 1, dataOffset);
+                            if (currEnc == 1)
+                                tempForMin[prevEnc] = C40OrTextEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], f[prevEnc][i - 1] + dataOffset, dataSize - f[prevEnc][i - 1], true, i, prevEnc + 1, dataOffset);
+                            if (currEnc == 2)
+                                tempForMin[prevEnc] = C40OrTextEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], f[prevEnc][i - 1] + dataOffset, dataSize - f[prevEnc][i - 1], false, i, prevEnc + 1, dataOffset);
+                            if (currEnc == 3)
+                                tempForMin[prevEnc] = b256Encodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], f[prevEnc][i - 1] + dataOffset, dataSize - f[prevEnc][i - 1], i, prevEnc + 1, dataOffset);
+                            if (currEnc == 4)
+                                tempForMin[prevEnc] = X12Encodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], f[prevEnc][i - 1] + dataOffset, dataSize - f[prevEnc][i - 1], i, prevEnc + 1, dataOffset);
+                            if (currEnc == 5)
+                                tempForMin[prevEnc] = EdifactEncodation(text, textOffset + i, 1, dataDynamicInner[prevEnc], f[prevEnc][i - 1] + dataOffset, dataSize - f[prevEnc][i - 1], i, prevEnc + 1, dataOffset, sizeFixed);
+                        }
                     }
                     solveFAndSwitchMode(tempForMin, currEnc, i);
                     if (switchMode[currEnc][i] != 0)
@@ -1384,10 +1393,10 @@ else if (eci < 16383) {
                     if (ptrIn + 1 > textSize)
                         return -1;
                     c = text[textOffset + ptrIn++] & 0xff;
-                    if (c != '5' && c != '5')
+                    if (c != '5')
                         return -1;
                     data[ptrOut++] = (byte) 234;
-                    data[ptrOut++] = (byte) (c == '5' ? 236 : 237);
+                    data[ptrOut++] = (byte) 236;
                     break;
                 case 'f':
                     if (order != 1 && (order != 2 || text[textOffset] != 's' && text[textOffset] != 'm'))
@@ -1397,5 +1406,4 @@ else if (eci < 16383) {
         }
         return -1;
     }
-
 }
@@ -44,21 +44,25 @@ This file is part of the iText (R) project.
 package com.itextpdf.barcodes.dmcode;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class Placement {
-    private int nrow;
-    private int ncol;
-    private short[] array;
-    private static final Map<Integer, short[]> cache = new HashMap<>();
-
-    private Placement() {
+    private final int nrow;
+    private final int ncol;
+    private final short[] array;
+    private static final Map<Integer, short[]> cache = new ConcurrentHashMap<>();
+
+    private Placement(int nrow, int ncol) {
+        this.nrow = nrow;
+        this.ncol = ncol;
+        array = new short[nrow * ncol];
     }
 
 
     /**
      * Execute the placement
+     *
      * @param nrow number of rows
      * @param ncol number of columns
      * @return array containing appropriate values for ECC200
@@ -68,10 +72,7 @@ public static short[] doPlacement(int nrow, int ncol) {
         short[] pc = cache.get(key);
         if (pc != null)
             return pc;
-        Placement p = new Placement();
-        p.nrow = nrow;
-        p.ncol = ncol;
-        p.array = new short[nrow * ncol];
+        Placement p = new Placement(nrow, ncol);
         p.ecc200();
         cache.put(key, p.array);
         return p.array;
@@ -150,19 +151,19 @@ private void corner4(int chr) {
     /* "ECC200" fills an nrow x ncol array with appropriate values for ECC200 */
     private void ecc200() {
         int row, col, chr;
-            /* First, fill the array[] with invalid entries */
+        /* First, fill the array[] with invalid entries */
         Arrays.fill(array, (short) 0);
-            /* Starting in the correct location for character #1, bit 8,... */
+        /* Starting in the correct location for character #1, bit 8,... */
         chr = 1;
         row = 4;
         col = 0;
         do {
-                /* repeatedly first check for one of the special corner cases, then... */
+            /* repeatedly first check for one of the special corner cases, then... */
             if (row == nrow && col == 0) corner1(chr++);
             if (row == nrow - 2 && col == 0 && ncol % 4 != 0) corner2(chr++);
             if (row == nrow - 2 && col == 0 && ncol % 8 == 4) corner3(chr++);
             if (row == nrow + 4 && col == 2 && ncol % 8 == 0) corner4(chr++);
-                /* sweep upward diagonally, inserting successive characters,... */
+            /* sweep upward diagonally, inserting successive characters,... */
             do {
                 if (row < nrow && col >= 0 && array[row * ncol + col] == 0)
                     utah(row, col, chr++);
@@ -171,7 +172,7 @@ private void ecc200() {
             } while (row >= 0 && col < ncol);
             row += 1;
             col += 3;
-                /* & then sweep downward diagonally, inserting successive characters,... */
+            /* & then sweep downward diagonally, inserting successive characters,... */
 
             do {
                 if (row >= 0 && col < ncol && array[row * ncol + col] == 0)
@@ -181,9 +182,9 @@ private void ecc200() {
             } while (row < nrow && col >= 0);
             row += 3;
             col += 1;
-                /* ... until the entire array is scanned */
+            /* ... until the entire array is scanned */
         } while (row < nrow || col < ncol);
-            /* Lastly, if the lower righthand corner is untouched, fill in fixed pattern */
+        /* Lastly, if the lower righthand corner is untouched, fill in fixed pattern */
         if (array[nrow * ncol - 1] == 0) {
             array[nrow * ncol - 1] = array[nrow * ncol - ncol - 2] = 1;
         }