Fix #1072

hhrutter · hhrutter · commit 9310068b99aa · 2025-02-21T17:06:42.000+01:00
diff --git a/pkg/pdfcpu/read.go b/pkg/pdfcpu/read.go
@@ -1349,13 +1349,14 @@ func parseAndLoad(c context.Context, ctx *model.Context, line string, offset *in
 		return nil
 	}
 
-	d, ok := o.(types.Dict)
-	if ok && ctx.RootDict == nil {
-		if typ := d.Type(); typ != nil {
-			if *typ == "Catalog" {
-				ctx.RootDict = d
-				ctx.Root = types.NewIndirectRef(*objNr, *generation)
-				model.ShowRepaired("catalog")
+	if ctx.RootDict == nil {
+		if d, ok := o.(types.Dict); ok {
+			if typ := d.Type(); typ != nil {
+				if *typ == "Catalog" {
+					ctx.RootDict = d
+					ctx.Root = types.NewIndirectRef(*objNr, *generation)
+					model.ShowRepaired("catalog")
+				}
 			}
 		}
 	}
diff --git a/pkg/pdfcpu/validate/page.go b/pkg/pdfcpu/validate/page.go
@@ -128,6 +128,16 @@ func validatePageContents(xRefTable *model.XRefTable, d types.Dict) (hasContents
 		d.Delete("Contents")
 		model.ShowRepaired("page dict \"Contents\"")
 
+	case types.Dict:
+
+		if len(o) > 0 || xRefTable.ValidationMode == model.ValidationStrict {
+			return false, errors.Errorf("validatePageContents: page content must be stream dict or array, got: %T", o)
+		}
+
+		// Digest empty dict.
+		d.Delete("Contents")
+		model.ShowRepaired("page dict \"Contents\"")
+
 	default:
 		return false, errors.Errorf("validatePageContents: page content must be stream dict or array, got: %T", o)
 	}

Original file line number	Diff line number	Diff line change
`@@ -1349,13 +1349,14 @@ func parseAndLoad(c context.Context, ctx model.Context, line string, offset in`
`1349`	`1349`	`return nil`
`1350`	`1350`	`}`
`1351`	`1351`
`1352`		`- d, ok := o.(types.Dict)`
`1353`		`- if ok && ctx.RootDict == nil {`
`1354`		`- if typ := d.Type(); typ != nil {`
`1355`		`- if *typ == "Catalog" {`
`1356`		`- ctx.RootDict = d`
`1357`		`- ctx.Root = types.NewIndirectRef(objNr, generation)`
`1358`		`- model.ShowRepaired("catalog")`
	`1352`	`+ if ctx.RootDict == nil {`
	`1353`	`+ if d, ok := o.(types.Dict); ok {`
	`1354`	`+ if typ := d.Type(); typ != nil {`
	`1355`	`+ if *typ == "Catalog" {`
	`1356`	`+ ctx.RootDict = d`
	`1357`	`+ ctx.Root = types.NewIndirectRef(objNr, generation)`
	`1358`	`+ model.ShowRepaired("catalog")`
	`1359`	`+ }`
`1359`	`1360`	`}`
`1360`	`1361`	`}`
`1361`	`1362`	`}`