Fix #821

hhrutter · hhrutter · commit fd34b05a03e7 · 2024-03-06T11:43:16.000+01:00
diff --git a/pkg/api/attach.go b/pkg/api/attach.go
@@ -107,7 +107,7 @@ func AddAttachments(rs io.ReadSeeker, w io.Writer, files []string, coll bool, co
 		return errors.New("pdfcpu: AddAttachments: No attachment added")
 	}
 
-	return WriteContext(ctx, w)
+	return Write(ctx, w, conf)
 }
 
 // AddAttachmentsFile embeds files into a PDF context read from inFile and writes the result to outFile.
@@ -176,7 +176,7 @@ func RemoveAttachments(rs io.ReadSeeker, w io.Writer, files []string, conf *mode
 		return errors.New("pdfcpu: RemoveAttachments: No attachment removed")
 	}
 
-	return WriteContext(ctx, w)
+	return Write(ctx, w, conf)
 }
 
 // RemoveAttachmentsFile deletes embedded files from a PDF context read from inFile and writes the result to outFile.
diff --git a/pkg/pdfcpu/validate/xReftable.go b/pkg/pdfcpu/validate/xReftable.go
@@ -147,6 +147,11 @@ func validateNames(xRefTable *model.XRefTable, rootDict types.Dict, required boo
 			continue
 		}
 
+		if xRefTable.Names[treeName] != nil {
+			// Already internalized.
+			continue
+		}
+
 		d, err := xRefTable.DereferenceDict(value)
 		if err != nil {
 			return err
@@ -160,10 +165,8 @@ func validateNames(xRefTable *model.XRefTable, rootDict types.Dict, required boo
 			return err
 		}
 
-		// Internalize this name tree.
-		// If no validation takes place, name trees have to be internalized via xRefTable.LocateNameTree
-		// TODO Move this out of validation into Read.
 		if tree != nil {
+			// Internalize.
 			xRefTable.Names[treeName] = tree
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func AddAttachments(rs io.ReadSeeker, w io.Writer, files []string, coll bool, co`
`107`	`107`	`return errors.New("pdfcpu: AddAttachments: No attachment added")`
`108`	`108`	`}`
`109`	`109`
`110`		`- return WriteContext(ctx, w)`
	`110`	`+ return Write(ctx, w, conf)`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`// AddAttachmentsFile embeds files into a PDF context read from inFile and writes the result to outFile.`
`@@ -176,7 +176,7 @@ func RemoveAttachments(rs io.ReadSeeker, w io.Writer, files []string, conf *mode`
`176`	`176`	`return errors.New("pdfcpu: RemoveAttachments: No attachment removed")`
`177`	`177`	`}`
`178`	`178`
`179`		`- return WriteContext(ctx, w)`
	`179`	`+ return Write(ctx, w, conf)`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`// RemoveAttachmentsFile deletes embedded files from a PDF context read from inFile and writes the result to outFile.`