SVG: fix NPE in TransforUtil in case of invalid rotate/skewX/skewY

DEVSIX-2888

Author: introfog

svg/src/main/java/com/itextpdf/svg/exceptions/SvgExceptionMessageConstant.java

@@ -53,6 +53,7 @@ public final class SvgExceptionMessageConstant {
     public static final String INVALID_SMOOTH_CURVE_USE =
             "The smooth curve operations (S, s, T, t) may not be used as a first operator in path.";
     public static final String INVALID_TRANSFORM_DECLARATION = "Transformation declaration is not formed correctly.";
+    public static final String INVALID_TRANSFORM_VALUE = "Invalid transformation value: {0}";
     public static final String LINE_TO_EXPECTS_FOLLOWING_PARAMETERS_GOT_0 =
             "(x y)+ parameters are expected for lineTo operator. Got: {0}";
     public static final String MOVE_TO_EXPECTS_FOLLOWING_PARAMETERS_GOT_0 =

svg/src/main/java/com/itextpdf/svg/utils/TransformUtils.java

@@ -22,9 +22,9 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.svg.utils;
 
+import com.itextpdf.commons.utils.MessageFormatUtil;
 import com.itextpdf.kernel.geom.AffineTransform;
 import com.itextpdf.styledxmlparser.css.util.CssDimensionParsingUtils;
-import com.itextpdf.styledxmlparser.css.util.CssUtils;
 import com.itextpdf.svg.exceptions.SvgExceptionMessageConstant;
 import com.itextpdf.svg.exceptions.SvgProcessingException;
 
@@ -200,7 +200,7 @@ private static AffineTransform createSkewYTransformation(List<String> values) {
             throw new SvgProcessingException(SvgExceptionMessageConstant.TRANSFORM_INCORRECT_NUMBER_OF_VALUES);
         }
 
-        double tan = Math.tan(Math.toRadians((float) CssDimensionParsingUtils.parseFloat(values.get(0))));
+        double tan = Math.tan(Math.toRadians(parseTransformationValue(values.get(0))));
 
         //Differs from the notation in the PDF-spec for skews
         return new AffineTransform(1, tan, 0, 1, 0, 0);
@@ -217,7 +217,7 @@ private static AffineTransform createSkewXTransformation(List<String> values) {
             throw new SvgProcessingException(SvgExceptionMessageConstant.TRANSFORM_INCORRECT_NUMBER_OF_VALUES);
         }
 
-        double tan = Math.tan(Math.toRadians((float) CssDimensionParsingUtils.parseFloat(values.get(0))));
+        double tan = Math.tan(Math.toRadians(parseTransformationValue(values.get(0))));
 
         //Differs from the notation in the PDF-spec for skews
         return new AffineTransform(1, 0, tan, 1, 0, 0);
@@ -234,7 +234,7 @@ private static AffineTransform createRotationTransformation(List<String> values)
             throw new SvgProcessingException(SvgExceptionMessageConstant.TRANSFORM_INCORRECT_NUMBER_OF_VALUES);
         }
 
-        double angle = Math.toRadians((float) CssDimensionParsingUtils.parseFloat(values.get(0)));
+        double angle = Math.toRadians(parseTransformationValue(values.get(0)));
 
         if (values.size() == 3) {
             float centerX = CssDimensionParsingUtils.parseAbsoluteLength(values.get(1));
@@ -327,4 +327,14 @@ private static List<String> getValuesFromTransformationString(String transformat
 
         return SvgCssUtils.splitValueList(numbers);
     }
+
+    private static float parseTransformationValue(String valueStr) {
+        Float valueParsed = CssDimensionParsingUtils.parseFloat(valueStr);
+        if (valueParsed == null) {
+            throw new SvgProcessingException(MessageFormatUtil.format(
+                    SvgExceptionMessageConstant.INVALID_TRANSFORM_VALUE, valueStr));
+        } else {
+            return (float) valueParsed;
+        }
+    }
 }

svg/src/test/java/com/itextpdf/svg/utils/TransformUtilsTest.java

@@ -22,14 +22,15 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.svg.utils;
 
+import com.itextpdf.commons.utils.MessageFormatUtil;
 import com.itextpdf.kernel.geom.AffineTransform;
 import com.itextpdf.svg.exceptions.SvgExceptionMessageConstant;
 import com.itextpdf.svg.exceptions.SvgProcessingException;
 import com.itextpdf.test.ExtendedITextTest;
 
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
 @Tag("UnitTest")
 public class TransformUtilsTest extends ExtendedITextTest {
@@ -198,4 +199,28 @@ public void mixedWhiteSpace() {
 
         Assertions.assertEquals(expected, actual);
     }
+
+    @Test
+    public void parseInvalidRotateTest() {
+        Exception e = Assertions.assertThrows(SvgProcessingException.class,
+                () -> TransformUtils.parseTransform("rotate(text)"));
+        Assertions.assertEquals(MessageFormatUtil.format(SvgExceptionMessageConstant.INVALID_TRANSFORM_VALUE, "text"),
+                e.getMessage());
+    }
+
+    @Test
+    public void parseInvalidSkewXTest() {
+        Exception e = Assertions.assertThrows(SvgProcessingException.class,
+                () -> TransformUtils.parseTransform("skewX(text)"));
+        Assertions.assertEquals(MessageFormatUtil.format(SvgExceptionMessageConstant.INVALID_TRANSFORM_VALUE, "text"),
+                e.getMessage());
+    }
+
+    @Test
+    public void parseInvalidSkewYTest() {
+        Exception e = Assertions.assertThrows(SvgProcessingException.class,
+                () -> TransformUtils.parseTransform("skewY(text)"));
+        Assertions.assertEquals(MessageFormatUtil.format(SvgExceptionMessageConstant.INVALID_TRANSFORM_VALUE, "text"),
+                e.getMessage());
+    }
 }