Apache/poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2025-02-08 02:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

use ArithmeticUtils for calculations that might overflow

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1857594 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2019-04-15 15:45:59 +00:00
parent 8a1d0151ea
commit 3c7bb45e54
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
View File

@ -36,6 +36,7 @@ import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.apache.commons.math3.util.ArithmeticUtils;
import org.apache.poi.EmptyFileException; import org.apache.poi.EmptyFileException;
import org.apache.poi.poifs.common.POIFSBigBlockSize; import org.apache.poi.poifs.common.POIFSBigBlockSize;
import org.apache.poi.poifs.common.POIFSConstants; import org.apache.poi.poifs.common.POIFSConstants;
@ -407,7 +408,8 @@ public class POIFSFileSystem extends BlockStore
newBAT.setOurBlockIndex(offset); newBAT.setOurBlockIndex(offset);
// Ensure there's a spot in the file for it // Ensure there's a spot in the file for it
ByteBuffer buffer = ByteBuffer.allocate(bigBlockSize.getBigBlockSize()); ByteBuffer buffer = ByteBuffer.allocate(bigBlockSize.getBigBlockSize());
int writeTo = (1 + offset) * bigBlockSize.getBigBlockSize(); // Header isn't in BATs // Header isn't in BATs
long writeTo = ArithmeticUtils.mulAndCheck((1 + (long)offset), (long)bigBlockSize.getBigBlockSize());
_data.write(buffer, writeTo); _data.write(buffer, writeTo);
// All done // All done
return newBAT; return newBAT;

2
src/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java
View File

@ -42,7 +42,7 @@ public class TempFilePOIFSFileSystem extends POIFSFileSystem {
} }
public void close() throws IOException { public void close() throws IOException {
if (tempFile != null) tempFile.delete(); if (tempFile != null && tempFile.exists()) tempFile.delete();
super.close(); super.close();
} }