#25247 Fixing case when we try to get dimensions from a broken svg (#…

…25802) * #25247 Fixing case when we try to get dimensions from a broken svg * #25247 Fixing case when we try to get dimensions from a broken svg --------- Co-authored-by: nollymar <[email protected]>
dotCMS · Aug 17, 2023 · ec6a839 · ec6a839
1 parent f6b4e1e
commit ec6a839
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/dotCMS/src/integration-test/java/com/dotmarketing/image/filter/ImageFilterAPIImplTest.java b/dotCMS/src/integration-test/java/com/dotmarketing/image/filter/ImageFilterAPIImplTest.java
@@ -76,6 +76,21 @@ public void test_dimensions() {
         assert (dim.getHeight() == 772d);
         assert (dim.getWidth() == 1024d);
 
+        url = getClass().getResource("/images/test.svg");
+        incomingFile = new File(url.getFile());
+
+        dim = imageApi.getWidthHeight(incomingFile);
+        assert (dim.getHeight() > 0);
+        assert (dim.getWidth() > 0);
+
+        //We should get dimensions even when the svg file is actually a png
+        url = getClass().getResource("/images/png_as_svg.svg");
+        incomingFile = new File(url.getFile());
+
+        dim = imageApi.getWidthHeight(incomingFile);
+        assert (dim.getHeight() > 0);
+        assert (dim.getWidth() > 0);
+
     }
 
 

diff --git a/dotCMS/src/integration-test/resources/images/png_as_svg.svg b/dotCMS/src/integration-test/resources/images/png_as_svg.svg
diff --git a/dotCMS/src/main/java/com/dotmarketing/image/filter/ImageFilterApiImpl.java b/dotCMS/src/main/java/com/dotmarketing/image/filter/ImageFilterApiImpl.java
@@ -112,7 +112,12 @@ public Dimension getWidthHeight(final File imageFile) {
         }
 
         if (imageFile.getName().toLowerCase().endsWith(".svg")) {
-            return getWidthHeightofSVG(imageFile);
+            try {
+                return getWidthHeightofSVG(imageFile);
+            } catch (Exception e){
+                //If invoking the getWidthHeightofSVG method fails, we will try to get dimensions using the inputStream
+                Logger.debug(this, "Error getting dimensions of SVG file: " + imageFile.getName(), e);
+            }
         }