From b43faf2fae8e2c944145f738735f544f559886f8 Mon Sep 17 00:00:00 2001 From: Seafra Forder Date: Mon, 16 Jul 2018 14:21:57 +0100 Subject: [PATCH] Added an extra mark to match the reset call in the finally block --- .../imageio/plugins/pict/PICTImageReaderSpi.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java index 1e8b7736..c19d1d8b 100755 --- a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java +++ b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java @@ -69,6 +69,12 @@ public final class PICTImageReaderSpi extends ImageReaderSpiBase { else { // Skip header 512 bytes for file-based streams stream.reset(); + + // If we don't mark again here, the reset call in the finally block will: + // A) do nothing + // B) eat marks created in the stream previously + stream.mark(); + skipNullHeader(stream); }