mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Ignore Annotations with empty /Rect-entries in the display-layer (issue 14438)

Browse source 
This prevents the `BaseSVGFactory.create`-method from throwing, and thus preventing any remaining Annotations (on the page) from rendering in corrupt documents.
This commit is contained in:
Jonas Jenwald 2022-01-11 13:43:16 +01:00
parent 236c8d4786
commit 08d88a0235
4 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/display/annotation_layer.js
View file

@ -40,6 +40,13 @@ import { XfaLayer } from "./xfa_layer.js";
const DEFAULT_TAB_INDEX = 1000;
const GetElementsByNameSet = new WeakSet();
function getRectDims(rect) {
return {
width: rect[2] - rect[0],
height: rect[3] - rect[1],
};
}
/**
* @typedef {Object} AnnotationElementParameters
* @property {Object} data
@ -189,8 +196,7 @@ class AnnotationElement {
page = this.page,
viewport = this.viewport;
const container = document.createElement("section");
let width = data.rect[2] - data.rect[0];
let height = data.rect[3] - data.rect[1];
let { width, height } = getRectDims(data.rect);
container.setAttribute("data-annotation-id", data.id);
@ -1842,8 +1848,7 @@ class LineAnnotationElement extends AnnotationElement {
// that acts as the trigger for the popup. Only the line itself should
// trigger the popup, not the entire container.
const data = this.data;
const width = data.rect[2] - data.rect[0];
const height = data.rect[3] - data.rect[1];
const { width, height } = getRectDims(data.rect);
const svg = this.svgFactory.create(width, height);
// PDF coordinates are calculated from a bottom left origin, so transform
@ -1888,8 +1893,7 @@ class SquareAnnotationElement extends AnnotationElement {
// trigger for the popup. Only the square itself should trigger the
// popup, not the entire container.
const data = this.data;
const width = data.rect[2] - data.rect[0];
const height = data.rect[3] - data.rect[1];
const { width, height } = getRectDims(data.rect);
const svg = this.svgFactory.create(width, height);
// The browser draws half of the borders inside the square and half of
@ -1936,8 +1940,7 @@ class CircleAnnotationElement extends AnnotationElement {
// trigger for the popup. Only the circle itself should trigger the
// popup, not the entire container.
const data = this.data;
const width = data.rect[2] - data.rect[0];
const height = data.rect[3] - data.rect[1];
const { width, height } = getRectDims(data.rect);
const svg = this.svgFactory.create(width, height);
// The browser draws half of the borders inside the circle and half of
@ -1987,8 +1990,7 @@ class PolylineAnnotationElement extends AnnotationElement {
// trigger for the popup. Only the polyline itself should trigger the
// popup, not the entire container.
const data = this.data;
const width = data.rect[2] - data.rect[0];
const height = data.rect[3] - data.rect[1];
const { width, height } = getRectDims(data.rect);
const svg = this.svgFactory.create(width, height);
// Convert the vertices array to a single points string that the SVG
@ -2076,8 +2078,7 @@ class InkAnnotationElement extends AnnotationElement {
// Create an invisible polyline with the same points that acts as the
// trigger for the popup.
const data = this.data;
const width = data.rect[2] - data.rect[0];
const height = data.rect[3] - data.rect[1];
const { width, height } = getRectDims(data.rect);
const svg = this.svgFactory.create(width, height);
for (const inkList of data.inkLists) {
@ -2337,6 +2338,10 @@ class AnnotationLayer {
if (!data) {
continue;
}
const { width, height } = getRectDims(data.rect);
if (width <= 0 || height <= 0) {
continue;
}
if (data.annotationType === AnnotationType.POPUP) {
popupAnnotations.push(data);
continue;