Fix #1116, clean up

hhrutter · hhrutter · commit 106feff79227 · 2025-04-21T23:54:34.000+02:00
diff --git a/pkg/pdfcpu/model/configuration.go b/pkg/pdfcpu/model/configuration.go
@@ -522,73 +522,6 @@ func NewRC4Configuration(userPW, ownerPW string, keyLength int) *Configuration {
 	return c
 }
 
-// func (c Configuration) String() string {
-// 	path := "default"
-// 	if len(c.Path) > 0 {
-// 		path = c.Path
-// 	}
-// 	return fmt.Sprintf("pdfcpu configuration:\n"+
-// 		"Path:                  %s\n"+
-// 		"CreationDate:		    %s\n"+
-// 		"Version:               %s\n"+
-// 		"CheckFileNameExt:      %t\n"+
-// 		"Reader15:              %t\n"+
-// 		"DecodeAllStreams:      %t\n"+
-// 		"ValidationMode:        %s\n"+
-// 		"PostProcessValidate:   %t\n"+
-// 		"ValidateLinks:         %t\n"+
-// 		"Eol:                   %s\n"+
-// 		"WriteObjectStream:     %t\n"+
-// 		"WriteXrefStream:       %t\n"+
-// 		"EncryptUsingAES:       %t\n"+
-// 		"EncryptKeyLength:      %d\n"+
-// 		"Permissions:           %d\n"+
-// 		"Unit:                  %s\n"+
-// 		"TimestampFormat:	    %s\n"+
-// 		"DateFormat:            %s\n"+
-// 		"Optimize:              %t\n"+
-// 		"OptimizeBeforeWriting: %t\n"+
-// 		"OptimizeResourceDicts: %t\n"+
-// 		"OptimizeDuplicateContentStreams %t\n"+
-// 		"CreateBookmarks:       %t\n"+
-// 		"NeedAppearances:       %t\n"+
-// 		"Offline:               %t\n"+
-// 		"Timeout:               %d\n"+
-// 		"TimeoutCRL:            %d\n"+
-// 		"TimeoutOCSP:           %d\n"+
-// 		"PrefCertRevChecker:    %s\n",
-// 		path,
-// 		c.CreationDate,
-// 		c.Version,
-// 		c.CheckFileNameExt,
-// 		c.Reader15,
-// 		c.DecodeAllStreams,
-// 		c.ValidationModeString(),
-// 		c.PostProcessValidate,
-// 		c.ValidateLinks,
-// 		c.EolString(),
-// 		c.WriteObjectStream,
-// 		c.WriteXRefStream,
-// 		c.EncryptUsingAES,
-// 		c.EncryptKeyLength,
-// 		c.Permissions,
-// 		c.UnitString(),
-// 		c.TimestampFormat,
-// 		c.DateFormat,
-// 		c.Optimize,
-// 		c.OptimizeBeforeWriting,
-// 		c.OptimizeResourceDicts,
-// 		c.OptimizeDuplicateContentStreams,
-// 		c.CreateBookmarks,
-// 		c.NeedAppearances,
-// 		c.Offline,
-// 		c.Timeout,
-// 		c.TimeoutCRL,
-// 		c.TimeoutOCSP,
-// 		c.PreferredCertRevocationCheckerString(),
-// 	)
-// }
-
 // EolString returns a string rep for the eol in effect.
 func (c *Configuration) EolString() string {
 	var s string
diff --git a/pkg/pdfcpu/types/streamdict.go b/pkg/pdfcpu/types/streamdict.go
@@ -426,7 +426,7 @@ func (sd *StreamDict) DecodeLength(maxLen int64) ([]byte, error) {
 
 // IndexedObject returns the object at given index from a ObjectStreamDict.
 func (osd *ObjectStreamDict) IndexedObject(index int) (Object, error) {
-	if osd.ObjArray == nil {
+	if osd.ObjArray == nil || index < 0 || index >= len(osd.ObjArray) {
 		return nil, errors.Errorf("IndexedObject(%d): object not available", index)
 	}
 	return osd.ObjArray[index], nil
diff --git a/pkg/pdfcpu/validate/nameTree.go b/pkg/pdfcpu/validate/nameTree.go
@@ -720,7 +720,10 @@ func validateNameTree(xRefTable *model.XRefTable, name string, d types.Dict, roo
 		}
 
 		if len(a) == 0 {
-			return "", "", nil, errors.New("pdfcpu: validateNameTree: missing \"Kids\" array")
+			if xRefTable.ValidationMode == model.ValidationStrict {
+				return "", "", nil, errors.New("pdfcpu: validateNameTree: missing \"Kids\" array")
+			}
+			return "", "", nil, nil
 		}
 
 		for _, o := range a {
@@ -738,7 +741,6 @@ func validateNameTree(xRefTable *model.XRefTable, name string, d types.Dict, roo
 					return "", "", nil, err
 				}
 				continue
-				//return kmin, kmax, nil, nil
 			}
 			if kmin == "" {
 				kmin = kminKid

Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ func (sd *StreamDict) DecodeLength(maxLen int64) ([]byte, error) {`
`426`	`426`
`427`	`427`	`// IndexedObject returns the object at given index from a ObjectStreamDict.`
`428`	`428`	`func (osd *ObjectStreamDict) IndexedObject(index int) (Object, error) {`
`429`		`- if osd.ObjArray == nil {`
	`429`	`+ if osd.ObjArray == nil \|\| index < 0 \|\| index >= len(osd.ObjArray) {`
`430`	`430`	`return nil, errors.Errorf("IndexedObject(%d): object not available", index)`
`431`	`431`	`}`
`432`	`432`	`return osd.ObjArray[index], nil`
Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,10 @@ func validateNameTree(xRefTable *model.XRefTable, name string, d types.Dict, roo`
`720`	`720`	`}`
`721`	`721`
`722`	`722`	`if len(a) == 0 {`
`723`		`- return "", "", nil, errors.New("pdfcpu: validateNameTree: missing \"Kids\" array")`
	`723`	`+ if xRefTable.ValidationMode == model.ValidationStrict {`
	`724`	`+ return "", "", nil, errors.New("pdfcpu: validateNameTree: missing \"Kids\" array")`
	`725`	`+ }`
	`726`	`+ return "", "", nil, nil`
`724`	`727`	`}`
`725`	`728`
`726`	`729`	`for _, o := range a {`
`@@ -738,7 +741,6 @@ func validateNameTree(xRefTable *model.XRefTable, name string, d types.Dict, roo`
`738`	`741`	`return "", "", nil, err`
`739`	`742`	`}`
`740`	`743`	`continue`
`741`		`- //return kmin, kmax, nil, nil`
`742`	`744`	`}`
`743`	`745`	`if kmin == "" {`
`744`	`746`	`kmin = kminKid`