Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-07-10 17:15:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20924 from calixteman/fix_null_ref

Browse Source 
Avoid getting null value in RefSet when cloning
This commit is contained in:
calixteman 2026-03-20 16:31:01 +01:00 committed by GitHub
commit 504505b8c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,7 +249,8 @@ class PDFEditor {
obj = obj.slice(); obj = obj.slice();
} }
for (let i = 0, ii = obj.length; i < ii; i++) { for (let i = 0, ii = obj.length; i < ii; i++) {
const postponedActions = postponedRefCopies.get(obj[i]); const postponedActions =
obj[i] instanceof Ref && postponedRefCopies.get(obj[i]);
if (postponedActions) { if (postponedActions) {
// The object is a reference that needs to be copied later. // The object is a reference that needs to be copied later.
postponedActions.push(ref => (obj[i] = ref)); postponedActions.push(ref => (obj[i] = ref));
@ -277,7 +278,8 @@ class PDFEditor {
} }
if (dict) { if (dict) {
for (const [key, rawObj] of dict.getRawEntries()) { for (const [key, rawObj] of dict.getRawEntries()) {
const postponedActions = postponedRefCopies.get(rawObj); const postponedActions =
rawObj instanceof Ref && postponedRefCopies.get(rawObj);
if (postponedActions) { if (postponedActions) {
// The object is a reference that needs to be copied later. // The object is a reference that needs to be copied later.
postponedActions.push(ref => dict.set(key, ref)); postponedActions.push(ref => dict.set(key, ref));
@ -1083,7 +1085,7 @@ class PDFEditor {
// Fix the ID tree. // Fix the ID tree.
for (const [id, nodeRef] of idTree || []) { for (const [id, nodeRef] of idTree || []) {
const newNodeRef = oldRefMapping.get(nodeRef); const newNodeRef = nodeRef instanceof Ref && oldRefMapping.get(nodeRef);
const newId = dedupIDs.get(id) || id; const newId = dedupIDs.get(id) || id;
if (newNodeRef) { if (newNodeRef) {
newIdTree.set(newId, newNodeRef); newIdTree.set(newId, newNodeRef);
@ -1137,7 +1139,7 @@ class PDFEditor {
const newDestinations = (documentData.destinations = new Map()); const newDestinations = (documentData.destinations = new Map());
for (const [key, dest] of Object.entries(destinations)) { for (const [key, dest] of Object.entries(destinations)) {
const pageRef = dest[0]; const pageRef = dest[0];
const pageData = pagesMap.get(pageRef); const pageData = pageRef instanceof Ref && pagesMap.get(pageRef);
if (!pageData) { if (!pageData) {
continue; continue;
} }
@ -1537,7 +1539,7 @@ class PDFEditor {
} }
const { oldRefMapping } = documentData; const { oldRefMapping } = documentData;
for (const coRef of co) { for (const coRef of co) {
const newCoRef = oldRefMapping.get(coRef); const newCoRef = coRef instanceof Ref && oldRefMapping.get(coRef);
if (newCoRef) { if (newCoRef) {
calculationOrder.push(newCoRef); calculationOrder.push(newCoRef);
} }

1
test/pdfs/.gitignore vendored
View File

@ -888,3 +888,4 @@
!outlines_for_editor.pdf !outlines_for_editor.pdf
!mesh_shading_empty.pdf !mesh_shading_empty.pdf
!acroform_calculation_order.pdf !acroform_calculation_order.pdf
!extractPages_null_in_array.pdf

21
test/pdfs/extractPages_null_in_array.pdf Normal file
View File

@ -0,0 +1,21 @@
%PDF-1.0
1 0 obj
<< /Type /Catalog /Pages 2 0 R >>
endobj
2 0 obj
<< /Type /Pages /Kids [3 0 R] /Count 1 >>
endobj
3 0 obj
<< /Type /Page /Parent 2 0 R /MediaBox [0 0 612 792] /Resources << /Dummy [null] >> >>
endobj
xref
0 4
0000000000 65535 f
0000000009 00000 n
0000000058 00000 n
0000000115 00000 n
trailer
<< /Size 4 /Root 1 0 R >>
startxref
217
%%EOF

16
test/unit/api_spec.js
View File

@ -6763,5 +6763,21 @@ small scripts as well as for`);
await newLoadingTask.destroy(); await newLoadingTask.destroy();
}); });
}); });
describe("extract pages with null values in arrays", function () {
it("should not crash when a page resource contains an array with null entries", async function () {
const loadingTask = getDocument(
buildGetDocumentParams("extractPages_null_in_array.pdf")
);
const pdfDoc = await loadingTask.promise;
const data = await pdfDoc.extractPages([{ document: null }]);
await loadingTask.destroy();
const newLoadingTask = getDocument(data);
const newPdfDoc = await newLoadingTask.promise;
expect(newPdfDoc.numPages).toEqual(1);
await newLoadingTask.destroy();
});
});
}); });
}); });