moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

sonar fixes - null dereference

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1831992 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2018-05-21 23:17:57 +00:00
parent e268b16754
commit 1d6a1c4072
12 changed files with 143 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/examples/src/org/apache/poi/hssf/usermodel/examples/AddDimensionedImage.java
View File

@ -279,14 +279,19 @@ public class AddDimensionedImage {
// The first two parameters are not used currently but could be if the
// need arose to extend the functionality of this code by adding the
// ability to specify that a clear 'border' be placed around the image.
anchor = new HSSFClientAnchor(0,
0,
colClientAnchorDetail.getInset(),
rowClientAnchorDetail.getInset(),
(short)colClientAnchorDetail.getFromIndex(),
rowClientAnchorDetail.getFromIndex(),
(short)colClientAnchorDetail.getToIndex(),
rowClientAnchorDetail.getToIndex());
int dx1 = 0, dy1 = 0, dx2 = 0, dy2 = 0;
short col1 = 0, col2 = 0, row1 = 0, row2 = 0;
if (colClientAnchorDetail != null) {
dx2 = colClientAnchorDetail.getInset();
col1 = (short)colClientAnchorDetail.getFromIndex();
col2 = (short)colClientAnchorDetail.getToIndex();
}
if (rowClientAnchorDetail != null) {
dy2 = rowClientAnchorDetail.getInset();
row1 = (short)rowClientAnchorDetail.getFromIndex();
row2 = (short)rowClientAnchorDetail.getToIndex();
}
anchor = new HSSFClientAnchor(dx1, dy1, dx2, dy2, col1, row1, col2, row2);
// For now, set the anchor type to do not move or resize the
// image as the size of the row/column is adjusted. This could easilly

5
src/java/org/apache/poi/common/usermodel/fonts/FontGroup.java
View File

@ -110,8 +110,11 @@ public enum FontGroup {
* @param runText the text which font groups are to be analyzed
* @return the FontGroup
*/
public static List<FontGroupRange> getFontGroupRanges(String runText) {
public static List<FontGroupRange> getFontGroupRanges(final String runText) {
List<FontGroupRange> ttrList = new ArrayList<>();
if (runText == null || runText.isEmpty()) {
return ttrList;
}
FontGroupRange ttrLast = null;
final int rlen = (runText != null) ? runText.length() : 0;
for(int cp, i = 0, charCount; i < rlen; i += charCount) {

9
src/java/org/apache/poi/hssf/model/InternalSheet.java
View File

@ -1377,7 +1377,9 @@ public final class InternalSheet {
windowTwo.setFreezePanes(false);
windowTwo.setFreezePanesNoSplit(false);
SelectionRecord sel = (SelectionRecord) findFirstRecordBySid(SelectionRecord.sid);
if (sel != null) {
sel.setPane(PaneInformation.PANE_UPPER_LEFT);
}
return;
}
@ -1402,8 +1404,9 @@ public final class InternalSheet {
windowTwo.setFreezePanesNoSplit(true);
SelectionRecord sel = (SelectionRecord) findFirstRecordBySid(SelectionRecord.sid);
sel.setPane((byte)pane.getActivePane());
if (sel != null) {
sel.setPane((byte) pane.getActivePane());
}
}
/**
@ -1437,7 +1440,9 @@ public final class InternalSheet {
windowTwo.setFreezePanesNoSplit(false);
SelectionRecord sel = (SelectionRecord) findFirstRecordBySid(SelectionRecord.sid);
if (sel != null) {
sel.setPane(PANE_LOWER_RIGHT);
}
}

3
src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
View File

@ -379,7 +379,8 @@ public final class EscherGraphics2d extends Graphics2D {
public Rectangle getClipBounds()
{
if(getDeviceclip() != null) {
return getClip().getBounds();
final Shape clip = getClip();
return clip != null ? clip.getBounds() : null;
}
return null;
}

6
src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java
View File

@ -219,8 +219,12 @@ public abstract class ChunkedCipherOutputStream extends FilterOutputStream {
? cipher.doFinal(chunk, 0, posInChunk, chunk)
: cipher.update(chunk, 0, posInChunk, chunk);
for (int i = plainByteFlags.nextSetBit(0); i >= 0 && i < posInChunk; i = plainByteFlags.nextSetBit(i+1)) {
if (plain != null) {
int i = plainByteFlags.nextSetBit(0);
while (i >= 0 && i < posInChunk) {
chunk[i] = plain[i];
i = plainByteFlags.nextSetBit(i+1);
}
}
return ciLen;

6
src/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java
View File

@ -164,8 +164,12 @@ public class XOREncryptor extends Encryptor implements Cloneable {
chunk[i] = value;
}
for (int i = plainBytes.nextSetBit(start); i >= 0 && i < posInChunk; i = plainBytes.nextSetBit(i+1)) {
if (plain != null) {
int i = plainBytes.nextSetBit(start);
while (i >= 0 && i < posInChunk) {
chunk[i] = plain[i];
i = plainBytes.nextSetBit(i + 1);
}
}
return posInChunk;

52
src/java/org/apache/poi/poifs/filesystem/ODocumentInputStream.java
View File

@ -18,6 +18,7 @@
package org.apache.poi.poifs.filesystem;
import java.io.IOException;
import java.util.function.Function;
import org.apache.poi.poifs.storage.DataInputBlock;
import org.apache.poi.util.RecordFormatException;
@ -214,40 +215,57 @@ public final class ODocumentInputStream extends DocumentInputStream {
@Override
public void readFully(byte[] buf, int off, int len) {
checkAvaliable(len);
int blockAvailable = _currentBlock.available();
Function<Integer,DataInputBlock> nextDataInputBlock = (offset) -> {
if (offset >= _document_size) {
_currentBlock = null;
} else if (offset != _current_offset) {
_currentBlock = getDataInputBlock(offset);
}
return _currentBlock;
};
_current_offset = readFullyInternal(buf, off, len, _current_offset, _document_size, nextDataInputBlock);
}
/* package */ static int readFullyInternal(byte[] buf, int off, int len, int currentOffset, int maxSize, Function<Integer,DataInputBlock> nextDataInputBlock) {
DataInputBlock currentBlock = nextDataInputBlock.apply(currentOffset);
if (currentBlock == null) {
throw new IllegalStateException("reached end of document stream unexpectedly");
}
int blockAvailable = currentBlock.available();
if (blockAvailable > len) {
_currentBlock.readFully(buf, off, len);
_current_offset += len;
return;
currentBlock.readFully(buf, off, len);
return currentOffset + len;
}
// else read big amount in chunks
int remaining = len;
int writePos = off;
int offset = currentOffset;
while (remaining > 0) {
boolean blockIsExpiring = remaining >= blockAvailable;
int reqSize;
if (blockIsExpiring) {
reqSize = blockAvailable;
} else {
reqSize = remaining;
}
_currentBlock.readFully(buf, writePos, reqSize);
final boolean blockIsExpiring = remaining >= blockAvailable;
final int reqSize = (blockIsExpiring) ? blockAvailable : remaining;
currentBlock.readFully(buf, writePos, reqSize);
remaining -= reqSize;
writePos += reqSize;
_current_offset += reqSize;
offset += reqSize;
if (blockIsExpiring) {
if (_current_offset == _document_size) {
if (offset >= maxSize) {
if (remaining > 0) {
throw new IllegalStateException(
"reached end of document stream unexpectedly");
}
_currentBlock = null;
break;
}
_currentBlock = getDataInputBlock(_current_offset);
blockAvailable = _currentBlock.available();
currentBlock = nextDataInputBlock.apply(offset);
if (currentBlock == null) {
throw new IllegalStateException(
"reached end of document stream unexpectedly");
}
blockAvailable = currentBlock.available();
}
}
return offset;
}
@Override

39
src/java/org/apache/poi/poifs/filesystem/OPOIFSDocument.java
View File

@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.function.Function;
import org.apache.poi.poifs.common.POIFSBigBlockSize;
import org.apache.poi.poifs.common.POIFSConstants;
@ -228,43 +229,7 @@ public final class OPOIFSDocument implements BATManaged, BlockWritable, POIFSVie
* This method is currently (Oct 2008) only used by test code. Perhaps it can be deleted
*/
void read(byte[] buffer, int offset) {
int len = buffer.length;
DataInputBlock currentBlock = getDataInputBlock(offset);
int blockAvailable = currentBlock.available();
if (blockAvailable > len) {
currentBlock.readFully(buffer, 0, len);
return;
}
// else read big amount in chunks
int remaining = len;
int writePos = 0;
int currentOffset = offset;
while (remaining > 0) {
boolean blockIsExpiring = remaining >= blockAvailable;
int reqSize;
if (blockIsExpiring) {
reqSize = blockAvailable;
} else {
reqSize = remaining;
}
currentBlock.readFully(buffer, writePos, reqSize);
remaining-=reqSize;
writePos+=reqSize;
currentOffset += reqSize;
if (blockIsExpiring) {
if (currentOffset == _size) {
if (remaining > 0) {
throw new IllegalStateException("reached end of document stream unexpectedly");
}
currentBlock = null;
break;
}
currentBlock = getDataInputBlock(currentOffset);
blockAvailable = currentBlock.available();
}
}
ODocumentInputStream.readFullyInternal(buffer, 0, buffer.length, offset, _size, this::getDataInputBlock);
}
/**

3
src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java
View File

@ -64,6 +64,9 @@ public abstract class HPBFPart {
public void writeOut(DirectoryNode baseDir) throws IOException {
String[] path = getPath();
if (path == null) {
return;
}
// Ensure that all parent directories exist
DirectoryNode dir = baseDir;

8
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
View File

@ -301,6 +301,7 @@ public final class HSLFFreeformShape extends HSLFAutoShape implements FreeformSh
while (vertIter.hasNext() && segIter.hasNext()) {
byte[] segElem = segIter.next();
PathInfo pi = getPathInfo(segElem);
if (pi != null) {
switch (pi) {
case escape: {
// handleEscapeInfo(path, segElem, vertIter);
@ -310,7 +311,7 @@ public final class HSLFFreeformShape extends HSLFAutoShape implements FreeformSh
fillPoint(vertIter.next(), xyPoints);
double x = xyPoints[0];
double y = xyPoints[1];
path.moveTo(x,y);
path.moveTo(x, y);
break;
}
case curveTo: {
@ -323,7 +324,7 @@ public final class HSLFFreeformShape extends HSLFAutoShape implements FreeformSh
fillPoint(vertIter.next(), xyPoints);
double x3 = xyPoints[0];
double y3 = xyPoints[1];
path.curveTo(x1,y1,x2,y2,x3,y3);
path.curveTo(x1, y1, x2, y2, x3, y3);
break;
}
case lineTo:
@ -331,7 +332,7 @@ public final class HSLFFreeformShape extends HSLFAutoShape implements FreeformSh
fillPoint(vertIter.next(), xyPoints);
double x = xyPoints[0];
double y = xyPoints[1];
path.lineTo(x,y);
path.lineTo(x, y);
}
break;
case close:
@ -341,6 +342,7 @@ public final class HSLFFreeformShape extends HSLFAutoShape implements FreeformSh
break;
}
}
}
EscherSimpleProperty shapePath = getShapeProp(opt, EscherProperties.GEOMETRY__SHAPEPATH);
ShapePath sp = ShapePath.valueOf(shapePath == null ? 1 : shapePath.getPropertyValue());

16
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectShape.java
View File

@ -212,7 +212,10 @@ public final class HSLFObjectShape extends HSLFPictureShape implements ObjectSha
}
public void setFullName(final String fullName) {
getExEmbed(true).setClipboardName(fullName);
final ExEmbed ex = getExEmbed(true);
if (ex != null) {
ex.setClipboardName(fullName);
}
}
@Override
@ -222,7 +225,10 @@ public final class HSLFObjectShape extends HSLFPictureShape implements ObjectSha
}
public void setProgId(final String progId) {
getExEmbed(true).setProgId(progId);
final ExEmbed ex = getExEmbed(true);
if (ex != null) {
ex.setProgId(progId);
}
}
public OutputStream updateObjectData(final Application application, final ObjectMetaData metaData) throws IOException {
@ -246,16 +252,18 @@ public final class HSLFObjectShape extends HSLFPictureShape implements ObjectSha
poifs.getRoot().setStorageClsid(md.getClassID());
int oid = getObjectID();
if (oid == 0) {
// assign new embedding
oid = ppt.addEmbed(poifs);
setObjectID(oid);
} else {
final HSLFObjectData od = getObjectData();
if (od != null) {
ByteArrayOutputStream bos = new ByteArrayOutputStream(this.size()+1000);
poifs.writeFilesystem(bos);
getObjectData().setData(bos.toByteArray());
od.setData(bos.toByteArray());
}
}
setProgId(md.getProgId());

20
src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java
View File

@ -208,15 +208,17 @@ public final class HeaderStories {
// First page header is optional, only return
// if it's set
if(pageNumber == 1) {
if(getFirstHeader().length() > 0) {
return getFirstHeader();
final String fh = getFirstHeader();
if(fh != null && !fh.isEmpty()) {
return fh;
}
}
// Even page header is optional, only return
// if it's set
if(pageNumber % 2 == 0) {
if(getEvenHeader().length() > 0) {
return getEvenHeader();
final String eh = getEvenHeader();
if(eh != null && !eh.isEmpty()) {
return eh;
}
}
// Odd is the default
@ -274,15 +276,17 @@ public final class HeaderStories {
// First page footer is optional, only return
// if it's set
if(pageNumber == 1) {
if(getFirstFooter().length() > 0) {
return getFirstFooter();
final String ff = getFirstFooter();
if(ff != null && !ff.isEmpty()) {
return ff;
}
}
// Even page footer is optional, only return
// if it's set
if(pageNumber % 2 == 0) {
if(getEvenFooter().length() > 0) {
return getEvenFooter();
final String ef = getEvenFooter();
if(ef != null && !ef.isEmpty()) {
return ef;
}
}
// Odd is the default