debian/changelog

+libsambox-java (1.1.55-1) unstable; urgency=medium
+
+  * New upstream version 1.1.55.
+
+ -- Markus Koschany <apo@debian.org>  Tue, 10 Sep 2019 13:42:00 +0200
+
 libsambox-java (1.1.53-1) unstable; urgency=medium
 
   * New upstream version 1.1.53

pom.xml

@@ -5,7 +5,7 @@
 	<artifactId>sambox</artifactId>
 	<packaging>jar</packaging>
 	<name>sambox</name>
-	<version>1.1.53</version>
+	<version>1.1.55</version>
 
 	<description>An Apache PDFBox fork intended to be used as PDF processor for Sejda and PDFsam related projects</description>
 	<url>http://www.sejda.org</url>
@@ -33,7 +33,7 @@
 		<connection>scm:git:git@github.com:torakiki/sambox.git</connection>
 		<developerConnection>scm:git:git@github.com:torakiki/sambox.git</developerConnection>
 		<url>scm:git:git@github.com:torakiki/sambox.git</url>
-		<tag>v1.1.53</tag>
+		<tag>v1.1.55</tag>
 	</scm>
 
 	<developers>

src/main/java/org/sejda/sambox/pdmodel/graphics/image/PDImageXObject.java

@@ -179,8 +179,18 @@ public final class PDImageXObject extends PDXObject implements PDImage
             }
         }
         // last resort, let's see if ImageIO can read it
-        BufferedImage image = ImageIO.read(file);
-        requireNotNullArg(image, "Image type " + fileType + " not supported " + file.getName());
+        BufferedImage image;
+        try {
+            image = ImageIO.read(file);
+        } catch (Exception e) {
+            LOG.warn(String.format("An error occurred while reading image: %s type: %s", file.getName(), fileType), e);
+            throw new UnsupportedImageFormatException(fileType, file.getName(), e);
+        }
+
+        if(image == null) {
+            LOG.warn(String.format("Could not read image format: %s type: %s", file.getName(), fileType));
+            throw new UnsupportedImageFormatException(fileType, file.getName(), null);
+        }
         return LosslessFactory.createFromImage(image);
     }
 

src/main/java/org/sejda/sambox/pdmodel/graphics/image/UnsupportedImageFormatException.java

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sejda.sambox.pdmodel.graphics.image;
+
+import org.sejda.sambox.util.filetypedetector.FileType;
+
+public class UnsupportedImageFormatException extends IllegalArgumentException
+{
+    private final FileType fileType;
+    private final String filename;
+
+    public UnsupportedImageFormatException(FileType fileType, String filename, Throwable cause) {
+        super("Image type " + fileType + " not supported " + filename, cause);
+        this.filename = filename;
+        this.fileType = fileType;
+    }
+
+    public FileType getFileType() {
+        return fileType;
+    }
+
+    public String getFilename() {
+        return filename;
+    }
+}

src/main/resources/org/sejda/sambox/resources/images/broken.png

+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+sambox.version=${project.version}