Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-08-01 20:07:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21658 from calixteman/fix/pdf-editor-clone-reference-race

Browse Source 
Avoid duplicate shared object clones
This commit is contained in:
Tim van der Meij 2026-07-30 20:52:35 +02:00 committed by GitHub
commit f70f55d743
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/editor/pdf_editor.js
View File

@ -271,6 +271,12 @@ class PDFEditor {
}
const oldRef = obj;
obj = await xref.fetchAsync(oldRef);
const mappedRef = oldRefMapping.get(oldRef);
if (mappedRef) {
// Another concurrent traversal may have allocated the clone while the
// source object was being fetched.
return mappedRef;
}
if (typeof obj === "number") {
// Simple value; no need to create a new reference.
return obj;

23
test/unit/api_spec.js
View File

@ -6286,6 +6286,29 @@ small scripts as well as for`);
await loadingTask.destroy();
});
it("clones shared indirect objects reached concurrently only once", async function () {
const pdfData = assemblePdf([
"1 0 obj\n<< /Type /Catalog /Pages 2 0 R >>\nendobj\n",
"2 0 obj\n<< /Type /Pages /Kids [3 0 R] /Count 1 >>\nendobj\n",
"3 0 obj\n<< /Type /Page /Parent 2 0 R " +
"/MediaBox [0 0 100 100] /Resources << /ExtGState " +
"<< /GS1 4 0 R /GS2 4 0 R >> >> >>\nendobj\n",
"4 0 obj\n<< /Type /ExtGState /CA 0.5 >>\nendobj\n",
]);
const loadingTask = getDocument({ data: pdfData });
const pdfDoc = await loadingTask.promise;
const data = await pdfDoc.extractPages([{ document: null }]);
expect(countMarker(data, "/Type /ExtGState")).toEqual(1);
await loadingTask.destroy();
const newLoadingTask = getDocument({ data });
const newPdfDoc = await newLoadingTask.promise;
expect(newPdfDoc.numPages).toEqual(1);
await newPdfDoc.getPage(1);
await newLoadingTask.destroy();
});
it("should merge two PDFs with page included ranges", async function () {
const loadingTask = getDocument(
buildGetDocumentParams("tracemonkey.pdf")