Merge pull request mozilla#17795 from calixteman/issue17794

Don't render corrupted inlined images
surfly · Mar 18, 2024 · 10305bf · 10305bf
2 parents 8ac57a6 + 9c3471d
commit 10305bf
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 21 deletions.
diff --git a/src/core/evaluator.js b/src/core/evaluator.js
@@ -739,27 +739,36 @@ class PartialEvaluator {
  !dict.has("Mask") &&
  w + h < SMALL_IMAGE_DIMENSIONS
  ) {
- const imageObj = new PDFImage({
- xref: this.xref,
- res: resources,
- image,
- isInline,
- pdfFunctionFactory: this._pdfFunctionFactory,
- localColorSpaceCache,
- });
- // We force the use of RGBA_32BPP images here, because we can't handle
- // any other kind.
- imgData = await imageObj.createImageData(
- /* forceRGBA = */ true,
- /* isOffscreenCanvasSupported = */ false
- );
- operatorList.isOffscreenCanvasSupported =
- this.options.isOffscreenCanvasSupported;
- operatorList.addImageOps(
- OPS.paintInlineImageXObject,
- [imgData],
- optionalContent
- );
+ try {
+ const imageObj = new PDFImage({
+ xref: this.xref,
+ res: resources,
+ image,
+ isInline,
+ pdfFunctionFactory: this._pdfFunctionFactory,
+ localColorSpaceCache,
+ });
+ // We force the use of RGBA_32BPP images here, because we can't handle
+ // any other kind.
+ imgData = await imageObj.createImageData(
+ /* forceRGBA = */ true,
+ /* isOffscreenCanvasSupported = */ false
+ );
+ operatorList.isOffscreenCanvasSupported =
+ this.options.isOffscreenCanvasSupported;
+ operatorList.addImageOps(
+ OPS.paintInlineImageXObject,
+ [imgData],
+ optionalContent
+ );
+ } catch (reason) {
+ const msg = `Unable to decode inline image: "${reason}".`;
+
+ if (!this.options.ignoreErrors) {
+ throw new Error(msg);
+ }
+ warn(msg);
+ }
  return;
  }
 

diff --git a/test/pdfs/issue17794.pdf.link b/test/pdfs/issue17794.pdf.link
@@ -0,0 +1,2 @@
+https://github.com/mozilla/pdf.js/files/14607428/image1.pdf
+
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -9771,5 +9771,13 @@
  "rounds": 1,
  "annotations": true,
  "type": "eq"
+ },
+ {
+ "id": "issue17794",
+ "file": "pdfs/issue17794.pdf",
+ "md5": "a66b5b938cb44ae241cad845cc3b5d2d",
+ "rounds": 1,
+ "link": true,
+ "type": "eq"
  }
 ]