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

refine conditions

This commit is contained in:
XenoAmess 2022-07-16 03:40:21 +08:00
parent 773ad5e825
commit 5726713983
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
poi/src/main/java/org/apache/poi/hpsf/TypedPropertyValue.java
View File

@ -255,7 +255,7 @@ public class TypedPropertyValue {
for (int i=0; i<skipBytes; i++) {
lei.mark(1);
int b = lei.read();
if (b == -1 || b != 0) {
if (b != 0) {
lei.reset();
break;
}

4
poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
View File

@ -2552,7 +2552,7 @@ public final class HSSFSheet implements Sheet {
if (rowDef != null) {
row1 = rowDef.getFirstRow();
row2 = rowDef.getLastRow();
if ((row1 == -1 && row2 != -1) || (row1 > row2)
if ((row1 > row2)
|| (row1 < 0 || row1 > maxRowIndex)
|| (row2 < 0 || row2 > maxRowIndex)) {
throw new IllegalArgumentException("Invalid row range specification");
@ -2561,7 +2561,7 @@ public final class HSSFSheet implements Sheet {
if (colDef != null) {
col1 = colDef.getFirstColumn();
col2 = colDef.getLastColumn();
if ((col1 == -1 && col2 != -1) || (col1 > col2)
if ((col1 > col2)
|| (col1 < 0 || col1 > maxColIndex)
|| (col2 < 0 || col2 > maxColIndex)) {
throw new IllegalArgumentException("Invalid column range specification");