Skip to content

fix issue #474 NPE when base64 decoding fail #490

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

Merged
danfickle merged 1 commit into from
May 27, 2020
Merged

fix issue #474 NPE when base64 decoding fail #490

Show file tree
Hide file tree
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
Binary file added ...tmltopdf-examples/src/main/resources/visualtest/expected/issue-474-npe-image-decoding.pdf
View file
Open in desktop
Binary file not shown.
17 changes: 17 additions & 0 deletions openhtmltopdf-examples/src/main/resources/visualtest/html/issue-474-npe-image-decoding.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<html>
<head>
<style>
@page {
size: 40px 40px;
margin: 0;
padding:0;
}
body {
background-color:red;
}
</style>
</head>
<body>
<div>a<img src="data:image/png;base64,iVB"/>b</div>
</body>
</html>
12 changes: 12 additions & 0 deletions ...-examples/src/test/java/com/openhtmltopdf/visualregressiontests/VisualRegressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,6 +1167,18 @@ public void testIssue482InfiniteLoopTable() throws IOException {
}));
}

/**
* Ensure there is no NPE exception launched if the decoding of an image fail (base64 case).
*
* See issue https://github.com/danfickle/openhtmltopdf/issues/474
*
* @throws IOException
*/
@Test
public void testIssue474NpeImageDecoding() throws IOException {
assertTrue(vt.runTest("issue-474-npe-image-decoding"));
}

// TODO:
// + Elements that appear just on generated overflow pages.
// + content property (page counters, etc)
Expand Down
7 changes: 5 additions & 2 deletions openhtmltopdf-pdfbox/src/main/java/com/openhtmltopdf/pdfboxout/PdfBoxUserAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,11 @@ public ImageResource getImageResource(String uriStr) {

if (ImageUtil.isEmbeddedBase64Image(uriResolved)) {
resource = loadEmbeddedBase64ImageResource(uriResolved);
_outputDevice.realizeImage((PdfBoxImage) resource.getImage());
_imageCache.put(uriResolved, resource);
// see issue 474: getImage can be null, as the loading of the embedded base64 resource may fail.
if (resource.getImage() != null) {
_outputDevice.realizeImage((PdfBoxImage) resource.getImage());
_imageCache.put(uriResolved, resource);
}
} else {
InputStream is = openStream(uriResolved);

Expand Down