Skip to content

delete unneeded code in PfbParser.parsePfb method #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
valerybokov wants to merge 1 commit into from
Closed

delete unneeded code in PfbParser.parsePfb method #502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions fontbox/src/main/java/org/apache/fontbox/pfb/PfbParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,24 +121,13 @@ public PfbParser(final byte[] bytes) throws IOException
*/
private void parsePfb(InputStream pfbStream) throws IOException
{
InputStream in;

if (pfbStream.markSupported())
{
in = pfbStream;
}
else
{
in = new BufferedInputStream(pfbStream);
}

// read into segments and keep them
List<Integer> typeList = new ArrayList<>(3);
List<byte[]> barrList = new ArrayList<>(3);
long total = 0;
do
{
int r = in.read();
int r = pfbStream.read();
if (r == -1 && total > 0)
{
break; // EOF
Expand All @@ -147,7 +136,7 @@ private void parsePfb(InputStream pfbStream) throws IOException
{
throw new IOException("Start marker missing");
}
int recordType = in.read();
int recordType = pfbStream.read();
if (recordType == EOF_MARKER)
{
break;
Expand All @@ -157,10 +146,10 @@ private void parsePfb(InputStream pfbStream) throws IOException
throw new IOException("Incorrect record type: " + recordType);
}

int size = in.read();
size += in.read() << 8;
size += in.read() << 16;
size += in.read() << 24;
int size = pfbStream.read();
size += pfbStream.read() << 8;
size += pfbStream.read() << 16;
size += pfbStream.read() << 24;
LOG.debug("record type: {}, segment size: {}", recordType, size);
if (size < 0)
{
Expand All @@ -169,7 +158,7 @@ private void parsePfb(InputStream pfbStream) throws IOException
// PDFBOX-6044: avoid potential OOM. readNBytes() grows its buffer
// incrementally as bytes actually arrive, so a bogus/huge size can
// never force an allocation larger than what the stream really holds.
byte[] ar = in.readNBytes(size);
byte[] ar = pfbStream.readNBytes(size);
if (ar.length != size)
{
throw new EOFException("EOF while reading PFB font");
Expand Down