svn commit: r1931235 - in pdfbox/branches/2.0: pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image tools/src/main/java/org/apache/pdfbox/tools/imageio

[tilman]

Author: tilman
Date: Sun Jan 11 11:08:28 2026
New Revision: 1931235

Log:
PDFBOX-5660: catch null, as suggested by Valery Bokov; closes #398

Modified:
   
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java
   
pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/imageio/ImageIOUtil.java

Modified: 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java
==============================================================================
--- 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java
  Sun Jan 11 10:02:59 2026        (r1931234)
+++ 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java
  Sun Jan 11 11:08:28 2026        (r1931235)
@@ -376,6 +376,10 @@ public final class JPEGFactory
         try
         {  
             ios = ImageIO.createImageOutputStream(baos);
+            if (ios == null)
+            {
+                throw new IOException("ImageIO.createImageOutputStream() 
returned null");
+            }
             imageWriter.setOutput(ios);
 
             // add compression

Modified: 
pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/imageio/ImageIOUtil.java
==============================================================================
--- 
pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/imageio/ImageIOUtil.java
    Sun Jan 11 10:02:59 2026        (r1931234)
+++ 
pdfbox/branches/2.0/tools/src/main/java/org/apache/pdfbox/tools/imageio/ImageIOUtil.java
    Sun Jan 11 11:08:28 2026        (r1931235)
@@ -349,6 +349,10 @@ public final class ImageIOUtil
 
             // write
             imageOutput = ImageIO.createImageOutputStream(output);
+            if (imageOutput == null)
+            {
+                return false;
+            }
             writer.setOutput(imageOutput);
             writer.write(null, new IIOImage(image, null, metadata), param);
         }