You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2019/04/15 23:10:04 UTC
svn commit: r1857609 - in /poi/trunk/src/java/org/apache/poi:
poifs/filesystem/POIFSDocument.java poifs/property/RootProperty.java
ss/formula/EvaluationConditionalFormatRule.java
Author: fanningpj
Date: Mon Apr 15 23:10:04 2019
New Revision: 1857609
URL: http://svn.apache.org/viewvc?rev=1857609&view=rev
Log:
some more checks for int overflows
Modified:
poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java
poi/trunk/src/java/org/apache/poi/poifs/property/RootProperty.java
poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
Modified: poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java?rev=1857609&r1=1857608&r2=1857609&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java Mon Apr 15 23:10:04 2019
@@ -154,7 +154,7 @@ public final class POIFSDocument impleme
}
}
- return (int)length;
+ return Math.toIntExact(length);
}
/**
Modified: poi/trunk/src/java/org/apache/poi/poifs/property/RootProperty.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/property/RootProperty.java?rev=1857609&r1=1857608&r2=1857609&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/property/RootProperty.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/property/RootProperty.java Mon Apr 15 23:10:04 2019
@@ -17,6 +17,7 @@
package org.apache.poi.poifs.property;
+import org.apache.commons.math3.util.ArithmeticUtils;
import org.apache.poi.poifs.common.POIFSConstants;
/**
@@ -55,7 +56,7 @@ public final class RootProperty extends
{
final int BLOCK_SHIFT = 6;
final int _block_size = 1 << BLOCK_SHIFT;
- super.setSize(size * _block_size);
+ super.setSize(ArithmeticUtils.mulAndCheck(size, _block_size));
}
/**
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java?rev=1857609&r1=1857608&r2=1857609&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java Mon Apr 15 23:10:04 2019
@@ -455,7 +455,7 @@ public class EvaluationConditionalFormat
Collections.sort(allValues);
}
- int limit = (int) conf.getRank();
+ int limit = Math.toIntExact(conf.getRank());
if (conf.getPercent()) {
limit = allValues.size() * limit / 100;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org