Skip to content

Refactor PfbParser.parsePfb #498

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

Open
valerybokov wants to merge 2 commits into
base: trunk
Choose a base branch
from
+33 −13
Open

Refactor PfbParser.parsePfb #498

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdff009
refactor-PfbParser.parsePfb
valerybokov Aug 20, 2026
a9eb896
Merge branch 'apache:trunk' into refactor-PfbParser.parsePfb
valerybokov Aug 21, 2026
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
46 changes: 33 additions & 13 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 @@ -17,12 +17,12 @@
package org.apache.fontbox.pfb;

import java.io.ByteArrayInputStream;
import java.io.BufferedInputStream;
import java.io.EOFException;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -88,7 +88,10 @@ public class PfbParser
*/
public PfbParser(final String filename) throws IOException
{
this(Files.readAllBytes(Paths.get(filename)));
try(InputStream is = new FileInputStream(filename))
{
parsePfb(is);
}
}

/**
Expand All @@ -98,8 +101,7 @@ public PfbParser(final String filename) throws IOException
*/
public PfbParser(final InputStream in) throws IOException
{
byte[] pfb = in.readAllBytes();
parsePfb(pfb);
parsePfb(in);
}

/**
Expand All @@ -109,24 +111,42 @@ public PfbParser(final InputStream in) throws IOException
*/
public PfbParser(final byte[] bytes) throws IOException
{
parsePfb(bytes);
parsePfb(new ByteArrayInputStream(bytes));
}

/**
* Parse the pfb-array.
* @param pfb The pfb-Array
* Parse the pfb-stream.
* @param pfbStream The pfb-stream
* @throws IOException in an IO-error occurs.
*/
private void parsePfb(final byte[] pfb) throws IOException
private void parsePfb(InputStream pfbStream) throws IOException
{
if (pfb.length < PFB_HEADER_LENGTH)
InputStream in;

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

in.mark(PFB_HEADER_LENGTH + 1);

int availableSize = in.available();

byte[] header = in.readNBytes(PFB_HEADER_LENGTH);
if (header.length < PFB_HEADER_LENGTH)
{
throw new IOException("PFB header missing");
}

in.reset();

// read into segments and keep them
List<Integer> typeList = new ArrayList<>(3);
List<byte[]> barrList = new ArrayList<>(3);
ByteArrayInputStream in = new ByteArrayInputStream(pfb);
long total = 0;
do
{
Expand Down Expand Up @@ -158,7 +178,7 @@ private void parsePfb(final byte[] pfb) throws IOException
{
throw new IOException("record size " + size + " is negative");
}
if (size > pfb.length)
if (size > availableSize)
{
// PDFBOX-6044: avoid potential OOM
throw new IOException("record size " + size + " would be larger than the input");
Expand All @@ -179,7 +199,7 @@ private void parsePfb(final byte[] pfb) throws IOException
// come first, then the binary segments, then the last ASCII segment if it is
// 0000... cleartomark

if (total > pfb.length)
if (total > availableSize)
{
// PDFBOX-6044: avoid potential OOM
throw new IOException("total record size " + total + " would be larger than the input");
Expand Down