Fix #953

hhrutter · hhrutter · commit 9749d6da7fae · 2024-09-26T14:59:14.000+02:00
diff --git a/pkg/pdfcpu/types/types.go b/pkg/pdfcpu/types/types.go
@@ -428,7 +428,7 @@ func (nameObject Name) Clone() Object {
 }
 
 func (nameObject Name) String() string {
-	return fmt.Sprint(string(nameObject))
+	return string(nameObject)
 }
 
 // PDFString returns a string representation as found in and written to a PDF file.
@@ -442,7 +442,7 @@ func (nameObject Name) PDFString() string {
 
 // Value returns a string value for this PDF object.
 func (nameObject Name) Value() string {
-	return string(nameObject)
+	return nameObject.String()
 }
 
 ///////////////////////////////////////////////////////////////////////////////////
diff --git a/pkg/pdfcpu/validate/object.go b/pkg/pdfcpu/validate/object.go
@@ -712,7 +712,7 @@ func validateNameEntry(xRefTable *model.XRefTable, d types.Dict, dictName, entry
 	// Validation
 	v := name.Value()
 	if validate != nil && (required || len(v) > 0) && !validate(v) {
-		return nil, errors.Errorf("pdfcpu: validateNameEntry: dict=%s entry=%s invalid dict entry: %s", dictName, entryName, v)
+		return &name, errors.Errorf("pdfcpu: validateNameEntry: dict=%s entry=%s invalid dict entry: %s", dictName, entryName, v)
 	}
 
 	if log.ValidateEnabled() {
diff --git a/pkg/pdfcpu/validate/xReftable.go b/pkg/pdfcpu/validate/xReftable.go
@@ -298,7 +298,13 @@ func pageModeValidator(v model.Version) func(s string) bool {
 func validatePageMode(xRefTable *model.XRefTable, rootDict types.Dict, required bool, sinceVersion model.Version) error {
 	n, err := validateNameEntry(xRefTable, rootDict, "rootDict", "PageMode", required, sinceVersion, pageModeValidator(xRefTable.Version()))
 	if err != nil {
-		return err
+		if xRefTable.ValidationMode == model.ValidationStrict || n == nil {
+			return err
+		}
+		// Relax validation of "UseAttachments" before PDF v1.6.
+		if *n != "UseAttachments" {
+			return err
+		}
 	}
 
 	if n != nil {

Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ func (nameObject Name) Clone() Object {`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`func (nameObject Name) String() string {`
`431`		`- return fmt.Sprint(string(nameObject))`
	`431`	`+ return string(nameObject)`
`432`	`432`	`}`
`433`	`433`
`434`	`434`	`// PDFString returns a string representation as found in and written to a PDF file.`
`@@ -442,7 +442,7 @@ func (nameObject Name) PDFString() string {`
`442`	`442`
`443`	`443`	`// Value returns a string value for this PDF object.`
`444`	`444`	`func (nameObject Name) Value() string {`
`445`		`- return string(nameObject)`
	`445`	`+ return nameObject.String()`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`///////////////////////////////////////////////////////////////////////////////////`
Original file line number	Diff line number	Diff line change
`@@ -712,7 +712,7 @@ func validateNameEntry(xRefTable *model.XRefTable, d types.Dict, dictName, entry`
`712`	`712`	`// Validation`
`713`	`713`	`v := name.Value()`
`714`	`714`	`if validate != nil && (required \|\| len(v) > 0) && !validate(v) {`
`715`		`- return nil, errors.Errorf("pdfcpu: validateNameEntry: dict=%s entry=%s invalid dict entry: %s", dictName, entryName, v)`
	`715`	`+ return &name, errors.Errorf("pdfcpu: validateNameEntry: dict=%s entry=%s invalid dict entry: %s", dictName, entryName, v)`
`716`	`716`	`}`
`717`	`717`
`718`	`718`	`if log.ValidateEnabled() {`