Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some cases where iterator usage does not check hasNext 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1855480 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2019-03-14 04:01:10 +00:00
parent 7f12edf416
commit 126606c838
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/java/org/apache/poi/ss/util/ImageUtils.java
View File

@ -59,7 +59,7 @@ public class ImageUtils {
* *
* @return image dimension in pixels * @return image dimension in pixels
*/ */
public static Dimension getImageDimension(InputStream is, int type){ public static Dimension getImageDimension(InputStream is, int type) {
Dimension size = new Dimension(); Dimension size = new Dimension();
switch (type){ switch (type){
@ -70,28 +70,29 @@ public class ImageUtils {
case Workbook.PICTURE_TYPE_DIB: case Workbook.PICTURE_TYPE_DIB:
try { try {
//read the image using javax.imageio.* //read the image using javax.imageio.*
ImageInputStream iis = ImageIO.createImageInputStream( is ); try (ImageInputStream iis = ImageIO.createImageInputStream(is)) {
try {
Iterator<ImageReader> i = ImageIO.getImageReaders( iis ); Iterator<ImageReader> i = ImageIO.getImageReaders( iis );
ImageReader r = i.next(); if (i.hasNext()) {
try { ImageReader r = i.next();
r.setInput( iis ); try {
BufferedImage img = r.read(0); r.setInput( iis );
BufferedImage img = r.read(0);
int[] dpi = getResolution(r);
int[] dpi = getResolution(r);
//if DPI is zero then assume standard 96 DPI
//since cannot divide by zero //if DPI is zero then assume standard 96 DPI
if (dpi[0] == 0) dpi[0] = PIXEL_DPI; //since cannot divide by zero
if (dpi[1] == 0) dpi[1] = PIXEL_DPI; if (dpi[0] == 0) dpi[0] = PIXEL_DPI;
if (dpi[1] == 0) dpi[1] = PIXEL_DPI;
size.width = img.getWidth()*PIXEL_DPI/dpi[0];
size.height = img.getHeight()*PIXEL_DPI/dpi[1]; size.width = img.getWidth()*PIXEL_DPI/dpi[0];
} finally { size.height = img.getHeight()*PIXEL_DPI/dpi[1];
r.dispose(); } finally {
r.dispose();
}
} else {
logger.log(POILogger.WARN, "ImageIO found no images");
} }
} finally {
iis.close();
} }
} catch (IOException e) { } catch (IOException e) {

2
src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java
View File

@ -98,7 +98,7 @@ public class GeometrySection extends XDGFSection {
Iterator<GeometryRow> rows = getCombinedRows().iterator(); Iterator<GeometryRow> rows = getCombinedRows().iterator();
// special cases // special cases
GeometryRow first = rows.next(); GeometryRow first = rows.hasNext() ? rows.next() : null;
if (first instanceof Ellipse) { if (first instanceof Ellipse) {
return ((Ellipse)first).getPath(); return ((Ellipse)first).getPath();

2
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
View File

@ -1220,7 +1220,7 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText
assert(!paragraphs.isEmpty() && !paragraphs.get(0).getTextRuns().isEmpty()); assert(!paragraphs.isEmpty() && !paragraphs.get(0).getTextRuns().isEmpty());
Iterator<HSLFTextParagraph> paraIter = paragraphs.iterator(); Iterator<HSLFTextParagraph> paraIter = paragraphs.iterator();
HSLFTextParagraph htp = paraIter.next(); // keep first HSLFTextParagraph htp = paraIter.hasNext() ? paraIter.next() : null; // keep first
assert (htp != null); assert (htp != null);
while (paraIter.hasNext()) { while (paraIter.hasNext()) {
paraIter.next(); paraIter.next();