Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 34 additions & 1 deletion src/parser/document-parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,23 @@ export class DocumentParser {

// Verify generation matches
if (result.genNum !== ref.generation) {
// Stale reference: neither the xref entry nor the object header
// carries the requested generation, so the ref does not refer to
// this object (ISO 32000-1 §7.5.4) and is treated as a reference
// to the null object (§7.3.10). Returning the live body here
// would register a second copy under the stale (num, gen).
if (entry.generation !== ref.generation) {
this.warnings.push(
`Stale reference ${ref.objectNumber} ${ref.generation} R: object ${ref.objectNumber} is at generation ${result.genNum}; treating as null`,
);

cache.set(key, null);

return null;
}

// Only the xref generation is wrong but the header matches the
// requested generation: keep the lenient behaviour.
this.warnings.push(
`Generation mismatch for object ${ref.objectNumber}: expected ${ref.generation}, got ${result.genNum}`,
);
Expand All @@ -693,12 +710,28 @@ export class DocumentParser {
}

case "compressed": {
// Objects in object streams always have generation 0
// (ISO 32000-1 §7.5.7), so any other generation is a stale ref.
if (ref.generation !== 0) {
this.warnings.push(
`Stale reference ${ref.objectNumber} ${ref.generation} R: compressed object ${ref.objectNumber} has generation 0; treating as null`,
);

cache.set(key, null);

return null;
}

// Get or create object stream parser
let streamParser = objectStreamCache.get(entry.streamObjNum);

if (!streamParser) {
// Load the object stream
const streamRef = PdfRef.of(entry.streamObjNum, 0);
// Look the stream up at its own xref generation so a malformed
// non-zero generation does not hide every object inside it.
const streamEntry = xref.get(entry.streamObjNum);
const streamGen = streamEntry?.type === "uncompressed" ? streamEntry.generation : 0;
const streamRef = PdfRef.of(entry.streamObjNum, streamGen);
const streamObj = getObject(streamRef);

if (!streamObj || !(streamObj instanceof PdfStream)) {
Expand Down
46 changes: 35 additions & 11 deletions src/writer/pdf-writer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,15 @@ function encryptStreamDict(stream: PdfStream, ctx: EncryptionContext): PdfStream
return encrypted;
}

/**
* Key for the renumbering map. Keyed by (object number, generation) because
* two refs with the same number but different generations are different
* objects (ISO 32000-1 §7.5.4) and must never share an output number.
*/
function refKey(ref: PdfRef): string {
return `${ref.objectNumber} ${ref.generation}`;
}

/**
* Renumber a single PdfRef using the renumbering map.
*
Expand All @@ -280,8 +289,8 @@ function encryptStreamDict(stream: PdfStream, ctx: EncryptionContext): PdfStream
* reachable objects, but is allowed defensively so unreachable trailing refs
* don't crash the writer).
*/
function renumberRef(ref: PdfRef, renumberMap: Map<number, number>): PdfRef {
const newNum = renumberMap.get(ref.objectNumber);
function renumberRef(ref: PdfRef, renumberMap: Map<string, number>): PdfRef {
const newNum = renumberMap.get(refKey(ref));

if (newNum === undefined) {
return ref;
Expand All @@ -301,9 +310,9 @@ function renumberRef(ref: PdfRef, renumberMap: Map<number, number>): PdfRef {
* in-memory `PDF` instance may be reused after `save()`, and mutating its
* objects would corrupt subsequent operations.
*/
function renumberRefs(obj: PdfObject, renumberMap: Map<number, number>): PdfObject {
function renumberRefs(obj: PdfObject, renumberMap: Map<string, number>): PdfObject {
if (obj instanceof PdfRef) {
const newNum = renumberMap.get(obj.objectNumber);
const newNum = renumberMap.get(refKey(obj));

if (newNum === undefined) {
return PdfNull.instance;
Expand Down Expand Up @@ -461,33 +470,48 @@ export function writeComplete(registry: ObjectRegistry, options: WriteOptions):
//
// Compaction also avoids embedding a record of how many objects the PDF
// used to have before garbage collection.
const renumberMap = new Map<number, number>();
const renumberMap = new Map<string, number>();
let nextNum = 1;

for (const [ref] of registry.entries()) {
const key = `${ref.objectNumber} ${ref.generation}`;
const key = refKey(ref);

if (!reachableKeys.has(key)) {
if (!reachableKeys.has(key) || renumberMap.has(key)) {
continue;
}

renumberMap.set(ref.objectNumber, nextNum++);
renumberMap.set(key, nextNum++);
}

// Renumber trailer-level refs (Root / Info / Encrypt) onto the new numbering.
const renumberedRoot = renumberRef(options.root, renumberMap);
const renumberedInfo = options.info ? renumberRef(options.info, renumberMap) : undefined;
const renumberedEncrypt = options.encrypt ? renumberRef(options.encrypt, renumberMap) : undefined;

// Write only reachable objects and record offsets
// Write only reachable objects and record offsets. Each (num, gen) is
// written exactly once.
const written = new Set<string>();

for (const [ref, obj] of registry.entries()) {
const key = `${ref.objectNumber} ${ref.generation}`;
const key = refKey(ref);

if (!reachableKeys.has(key)) {
continue; // Skip orphan objects
}

const newObjectNumber = renumberMap.get(ref.objectNumber)!;
if (written.has(key)) {
continue;
}

written.add(key);

const newObjectNumber = renumberMap.get(key)!;

if (offsets.has(newObjectNumber)) {
throw new Error(
`Internal error: two objects renumbered to ${newObjectNumber} during full save (source ${key})`,
);
}
const newRef = PdfRef.of(newObjectNumber, ref.generation);

// Prepare object (compress streams if needed)
Expand Down
Loading