Skip to content

Fix crashes induces by malformed compressed data #51

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.

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/phpdave11/gofpdi
module github.com/vsenko/gofpdi

go 1.12

Expand Down
10 changes: 8 additions & 2 deletions reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,10 @@ func (this *PdfReader) resolveCompressedObject(objSpec *PdfValue) (*PdfValue, er
// Decompress if filter is /FlateDecode
// Uncompress zlib compressed data
var out bytes.Buffer
zlibReader, _ := zlib.NewReader(bytes.NewBuffer(compressedObj.Stream.Bytes))
zlibReader, err := zlib.NewReader(bytes.NewBuffer(compressedObj.Stream.Bytes))
if err != nil {
return nil, errors.Wrap(err, "Failed to uncompress data")
}
defer zlibReader.Close()
io.Copy(&out, zlibReader)

Expand Down Expand Up @@ -1422,7 +1425,10 @@ func (this *PdfReader) rebuildContentStream(content *PdfValue) ([]byte, error) {
case "/FlateDecode":
// Uncompress zlib compressed data
var out bytes.Buffer
zlibReader, _ := zlib.NewReader(bytes.NewBuffer(stream))
zlibReader, err := zlib.NewReader(bytes.NewBuffer(stream))
if err != nil {
return nil, errors.Wrap(err, "Failed to uncompress data")
}
defer zlibReader.Close()
io.Copy(&out, zlibReader)

Expand Down
2 changes: 1 addition & 1 deletion writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func (this *PdfWriter) ImportPage(reader *PdfReader, pageno int, boxName string)
this.k = 1

// Get all page boxes
pageBoxes, err := reader.getPageBoxes(1, this.k)
pageBoxes, err := reader.getPageBoxes(pageno, this.k)
if err != nil {
return -1, errors.Wrap(err, "Failed to get page boxes")
}
Expand Down