Fix #617, #635

hhrutter · hhrutter · commit 53c77288cbd2 · 2023-07-02T14:07:04.000+02:00
diff --git a/pkg/pdfcpu/model/attach.go b/pkg/pdfcpu/model/attach.go
@@ -66,7 +66,7 @@ func decodeFileSpecStreamDict(sd *types.StreamDict, id string) error {
 	return sd.Decode()
 }
 
-func fileSpectStreamFileName(xRefTable *XRefTable, d types.Dict) (string, error) {
+func fileSpecStreamFileName(xRefTable *XRefTable, d types.Dict) (string, error) {
 	o, found := d.Find("UF")
 	if found {
 		fileName, err := xRefTable.DereferenceStringOrHexLiteral(o, V10, nil)
@@ -105,7 +105,7 @@ func fileSpecStreamDict(xRefTable *XRefTable, d types.Dict) (*types.StreamDict,
 }
 
 // NewFileSpectDictForAttachment returns a fileSpecDict for a.
-func (xRefTable *XRefTable) NewFileSpectDictForAttachment(a Attachment) (*types.IndirectRef, error) {
+func (xRefTable *XRefTable) NewFileSpecDictForAttachment(a Attachment) (*types.IndirectRef, error) {
 	modTime := time.Now()
 	if a.ModTime != nil {
 		modTime = *a.ModTime
@@ -115,7 +115,15 @@ func (xRefTable *XRefTable) NewFileSpectDictForAttachment(a Attachment) (*types.
 		return nil, err
 	}
 
-	d, err := xRefTable.NewFileSpecDict(a.ID, types.EncodeUTF16String(a.ID), a.Desc, *sd)
+	// TODO insert (escaped) reverse solidus before solidus between file name components.
+
+	// TODO Migrate to UTF-8 for both F and UF
+	s, err := types.EscapeUTF16String(a.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	d, err := xRefTable.NewFileSpecDict(a.ID, *s, a.Desc, *sd)
 	if err != nil {
 		return nil, err
 	}
@@ -138,7 +146,7 @@ func fileSpecStreamDictInfo(xRefTable *XRefTable, id string, o types.Object, dec
 		}
 	}
 
-	fileName, err := fileSpectStreamFileName(xRefTable, d)
+	fileName, err := fileSpecStreamFileName(xRefTable, d)
 	if err != nil {
 		return nil, "", "", nil, err
 	}
@@ -210,7 +218,7 @@ func (ctx *Context) AddAttachment(a Attachment, useCollection bool) error {
 		}
 	}
 
-	ir, err := xRefTable.NewFileSpectDictForAttachment(a)
+	ir, err := xRefTable.NewFileSpecDictForAttachment(a)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/pdfcpu/property.go b/pkg/pdfcpu/property.go
@@ -52,9 +52,8 @@ func PropertiesAdd(ctx *model.Context, properties map[string]string) error {
 
 	for k, v := range properties {
 		k1 := types.UTF8ToCP1252(k)
-		v1 := types.UTF8ToCP1252(v)
-		d[k1] = types.StringLiteral(v1)
-		ctx.Properties[k1] = v1
+		d[k1] = types.StringLiteral(v)
+		ctx.Properties[k1] = v
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func decodeFileSpecStreamDict(sd *types.StreamDict, id string) error {`
`66`	`66`	`return sd.Decode()`
`67`	`67`	`}`
`68`	`68`
`69`		`-func fileSpectStreamFileName(xRefTable *XRefTable, d types.Dict) (string, error) {`
	`69`	`+func fileSpecStreamFileName(xRefTable *XRefTable, d types.Dict) (string, error) {`
`70`	`70`	`o, found := d.Find("UF")`
`71`	`71`	`if found {`
`72`	`72`	`fileName, err := xRefTable.DereferenceStringOrHexLiteral(o, V10, nil)`
`@@ -105,7 +105,7 @@ func fileSpecStreamDict(xRefTable XRefTable, d types.Dict) (types.StreamDict,`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`// NewFileSpectDictForAttachment returns a fileSpecDict for a.`
`108`		`-func (xRefTable XRefTable) NewFileSpectDictForAttachment(a Attachment) (types.IndirectRef, error) {`
	`108`	`+func (xRefTable XRefTable) NewFileSpecDictForAttachment(a Attachment) (types.IndirectRef, error) {`
`109`	`109`	`modTime := time.Now()`
`110`	`110`	`if a.ModTime != nil {`
`111`	`111`	`modTime = *a.ModTime`
`@@ -115,7 +115,15 @@ func (xRefTable XRefTable) NewFileSpectDictForAttachment(a Attachment) (types.`
`115`	`115`	`return nil, err`
`116`	`116`	`}`
`117`	`117`
`118`		`- d, err := xRefTable.NewFileSpecDict(a.ID, types.EncodeUTF16String(a.ID), a.Desc, *sd)`
	`118`	`+ // TODO insert (escaped) reverse solidus before solidus between file name components.`
	`119`	`+`
	`120`	`+ // TODO Migrate to UTF-8 for both F and UF`
	`121`	`+ s, err := types.EscapeUTF16String(a.ID)`
	`122`	`+ if err != nil {`
	`123`	`+ return nil, err`
	`124`	`+ }`
	`125`	`+`
	`126`	`+ d, err := xRefTable.NewFileSpecDict(a.ID, s, a.Desc, sd)`
`119`	`127`	`if err != nil {`
`120`	`128`	`return nil, err`
`121`	`129`	`}`
`@@ -138,7 +146,7 @@ func fileSpecStreamDictInfo(xRefTable *XRefTable, id string, o types.Object, dec`
`138`	`146`	`}`
`139`	`147`	`}`
`140`	`148`
`141`		`- fileName, err := fileSpectStreamFileName(xRefTable, d)`
	`149`	`+ fileName, err := fileSpecStreamFileName(xRefTable, d)`
`142`	`150`	`if err != nil {`
`143`	`151`	`return nil, "", "", nil, err`
`144`	`152`	`}`
`@@ -210,7 +218,7 @@ func (ctx *Context) AddAttachment(a Attachment, useCollection bool) error {`
`210`	`218`	`}`
`211`	`219`	`}`
`212`	`220`
`213`		`- ir, err := xRefTable.NewFileSpectDictForAttachment(a)`
	`221`	`+ ir, err := xRefTable.NewFileSpecDictForAttachment(a)`
`214`	`222`	`if err != nil {`
`215`	`223`	`return err`
`216`	`224`	`}`