You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2026/03/01 06:31:28 UTC
svn commit: r1932086 - pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image
Author: tilman
Date: Sun Mar 1 06:31:28 2026
New Revision: 1932086
Log:
PDFBOX-6171: rewrite getDecodeArray() so that enlarged arrays are truncated but keep all the checks
Modified:
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java
Modified: pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java
==============================================================================
--- pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java Sun Mar 1 06:28:52 2026 (r1932085)
+++ pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java Sun Mar 1 06:31:28 2026 (r1932086)
@@ -33,6 +33,7 @@ import javax.imageio.stream.MemoryCacheI
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSArray;
+import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.filter.DecodeOptions;
import org.apache.pdfbox.io.IOUtils;
@@ -740,44 +741,40 @@ final class SampledImageReader
private static float[] getDecodeArray(PDImage pdImage) throws IOException
{
final COSArray cosDecode = pdImage.getDecode();
- float[] decode = null;
if (cosDecode != null)
{
int numberOfComponents = pdImage.getColorSpace().getNumberOfComponents();
- if (cosDecode.size() != numberOfComponents * 2)
+ if (cosDecode.size() >= numberOfComponents * 2)
{
- if (pdImage.isStencil() && cosDecode.size() >= 2
- && cosDecode.get(0) instanceof COSNumber
- && cosDecode.get(1) instanceof COSNumber)
- {
- float decode0 = ((COSNumber) cosDecode.get(0)).floatValue();
- float decode1 = ((COSNumber) cosDecode.get(1)).floatValue();
- if (decode0 >= 0 && decode0 <= 1 && decode1 >= 0 && decode1 <= 1)
+ boolean error = false;
+ float[] decode = new float[numberOfComponents * 2];
+ for (int i = 0; i < decode.length; ++i)
+ {
+ COSBase base = cosDecode.get(i);
+ if (base instanceof COSNumber)
{
- LOG.warn("decode array " + cosDecode
- + " not compatible with color space, using the first two entries");
- return new float[]
- {
- decode0, decode1
- };
+ decode[i] = ((COSNumber) base).floatValue();
+ }
+ else
+ {
+ error = true;
+ break;
}
}
- LOG.error("decode array " + cosDecode
- + " not compatible with color space, using default");
- }
- else
- {
- decode = cosDecode.toFloatArray();
+ if (pdImage.isStencil() && (decode[0] < 0 || decode[0] > 1 || decode[1] < 0 || decode[1] > 1))
+ {
+ error = true;
+ }
+ if (!error)
+ {
+ return decode;
+ }
}
}
// use color space default
- if (decode == null)
- {
- return pdImage.getColorSpace().getDefaultDecode(pdImage.getBitsPerComponent());
- }
-
- return decode;
+ LOG.error("decode array " + cosDecode + " not compatible with color space, using default");
+ return pdImage.getColorSpace().getDefaultDecode(pdImage.getBitsPerComponent());
}
}