You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2014/08/04 21:43:03 UTC
svn commit: r1615745 - in
/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter:
FlateFilter.java LZWFilter.java
Author: jahewson
Date: Mon Aug 4 19:43:03 2014
New Revision: 1615745
URL: http://svn.apache.org/r1615745
Log:
PDFBOX-1268: OutOfMemory Error because of huge colors
Modified:
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java
Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java?rev=1615745&r1=1615744&r2=1615745&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java Mon Aug 4 19:43:03 2014
@@ -85,7 +85,7 @@ public class FlateFilter implements Filt
// Decode data using given predictor
if (predictor > 1)
{
- int colors = dict.getInt(COSName.COLORS, 1);
+ int colors = Math.min(dict.getInt(COSName.COLORS, 1), 32);
int bitsPerPixel = dict.getInt(COSName.BITS_PER_COMPONENT, 8);
int columns = dict.getInt(COSName.COLUMNS, 1);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java?rev=1615745&r1=1615744&r2=1615745&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java Mon Aug 4 19:43:03 2014
@@ -98,7 +98,7 @@ public class LZWFilter implements Filter
}
if (predictor > 1)
{
- int colors = decodeParams.getInt(COSName.COLORS, 1);
+ int colors = Math.min(decodeParams.getInt(COSName.COLORS, 1), 32);
int bitsPerPixel = decodeParams.getInt(COSName.BITS_PER_COMPONENT, 8);
int columns = decodeParams.getInt(COSName.COLUMNS, 1);
ByteArrayOutputStream baos = new ByteArrayOutputStream();