#275 Fix infinite loop if EOF before header done

2026-05-27 00:00:02 -04:00 · 2016-08-08 11:27:12 +02:00
parent c18893184b
commit 44401d9a0d
2 changed files with 79 additions and 6 deletions
@@ -0,0 +1,70 @@
+package com.twelvemonkeys.imageio.plugins.svg;
+
+import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
+import com.twelvemonkeys.imageio.stream.URLImageInputStreamSpi;
+import org.junit.Test;
+
+import javax.imageio.ImageIO;
+import javax.imageio.spi.IIORegistry;
+import javax.imageio.spi.ImageReaderSpi;
+import javax.imageio.stream.ImageInputStream;
+import java.nio.charset.StandardCharsets;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * SVGImageReaderSpiTest.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: SVGImageReaderSpiTest.java,v 1.0 08/08/16 harald.kuhr Exp$
+ */
+public class SVGImageReaderSpiTest {
+
+    private static final String[] VALID_INPUTS = {
+            "/svg/Android_robot.svg", // Minimal, no xml dec, no namespace
+            "/svg/batikLogo.svg",     // xml dec, comments, namespace
+            "/svg/blue-square.svg",   // xml dec, namespace
+            "/svg/red-square.svg",
+    };
+
+    private static final String[] INVALID_INPUTS = {
+        "<xml>",
+        "<",
+        "<?",
+        "<?1",
+        "<?12",
+        "<?123", // #275 Infinite loop issue
+        "<!--",
+        "<!-- ", // #275 Infinite loop issue
+        "<?123?>", // #275 Infinite loop issue
+        "<svg",
+    };
+
+    static {
+        IIORegistry.getDefaultInstance().registerServiceProvider(new URLImageInputStreamSpi());
+        ImageIO.setUseCache(false);
+    }
+
+    private final ImageReaderSpi provider = new SVGImageReaderSpi();
+
+    @Test
+    public void canDecodeInput() throws Exception {
+        for (String validInput : VALID_INPUTS) {
+            try (ImageInputStream input = ImageIO.createImageInputStream(getClass().getResource(validInput))) {
+                assertTrue("Can't read valid input: " + validInput, provider.canDecodeInput(input));
+            }
+        }
+    }
+
+    // Test will time out, if EOFs are not properly detected, see #275
+    @Test(timeout = 5000)
+    public void canDecodeInputInvalid() throws Exception {
+        for (String invalidInput : INVALID_INPUTS) {
+            try (ImageInputStream input = new ByteArrayImageInputStream(invalidInput.getBytes(StandardCharsets.UTF_8))) {
+                assertFalse("Claims to read invalid input:" + invalidInput, provider.canDecodeInput(input));
+            }
+        }
+    }
+}