pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace assertion with exception

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1876951 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2020-04-24 21:31:49 +00:00
parent c7c5fc23be
commit 6ae31c8a67
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFont.java
View File

@ -461,17 +461,17 @@ public class HemfFont extends HwmfFont {
// A 32-bit unsigned integer that specifies the number of elements in the
// Values array. It MUST be in the range 0 to 16, inclusive.
int numAxes = leis.readInt();
assert (0 <= numAxes && numAxes <= 16);
size += 2*LittleEndianConsts.INT_SIZE;
// An optional array of 32-bit signed integers that specify the values of the font axes of a
// multiple master, OpenType font. The maximum number of values in the array is 16.
if (numAxes > 0) {
if (0 <= numAxes && numAxes <= 16) {
logEx.designVector = new int[numAxes];
for (int i=0; i<numAxes; i++) {
logEx.designVector[i] = leis.readInt();
}
size += numAxes*LittleEndianConsts.INT_SIZE;
}
size += (2+numAxes)*LittleEndianConsts.INT_SIZE;
}
return size;
@ -532,9 +532,9 @@ public class HemfFont extends HwmfFont {
b1 = buf[readBytes++];
b2 = buf[readBytes++];
} while ((b1 != 0 || b2 != 0) && b1 != -1 && b2 != -1 && readBytes <= limit*2);
sb.append(new String(buf, 0, readBytes-2, StandardCharsets.UTF_16LE));
return limit*2;
}
}

4
src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfRecordIterator.java
View File

@ -78,7 +78,9 @@ public class HemfRecordIterator implements Iterator<HemfRecord> {
try {
long remBytes = recordSize - HEADER_SIZE;
long readBytes = record.init(stream, remBytes, recordId);
assert (readBytes <= remBytes);
if (readBytes > remBytes) {
throw new RecordFormatException("Record limit exceeded - readBytes: "+readBytes+" / remBytes: "+remBytes);
}
stream.skipFully((int) (remBytes - readBytes));
} catch (RecordFormatException e) {
throw e;