Fix #710, #635

pdfcpu · Sep 13, 2023 · 4fbc44e · 4fbc44e
1 parent 04840dd
commit 4fbc44e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 11 deletions.
diff --git a/pkg/pdfcpu/model/xreftable.go b/pkg/pdfcpu/model/xreftable.go
@@ -649,16 +649,28 @@ func (xRefTable *XRefTable) NewFileSpecDict(f, uf, desc string, indRefStreamDict
 
 	d := types.NewDict()
 	d.InsertName("Type", "Filespec")
-	d.InsertString("F", f)
-	d.InsertString("UF", uf)
+
+	s, err := types.EscapeUTF16String(f)
+	if err != nil {
+		return nil, err
+	}
+	d.InsertString("F", *s)
+
+	if s, err = types.EscapeUTF16String(uf); err != nil {
+		return nil, err
+	}
+	d.InsertString("UF", *s)
 
 	efDict := types.NewDict()
 	efDict.Insert("F", indRefStreamDict)
 	efDict.Insert("UF", indRefStreamDict)
 	d.Insert("EF", efDict)
 
 	if desc != "" {
-		d.InsertString("Desc", desc)
+		if s, err = types.EscapeUTF16String(desc); err != nil {
+			return nil, err
+		}
+		d.InsertString("Desc", *s)
 	}
 
 	// CI, optional, collection item dict, since V1.7

diff --git a/pkg/pdfcpu/types/date.go b/pkg/pdfcpu/types/date.go
@@ -119,12 +119,18 @@ func parseTimezone(s string, relaxed bool) (h, m int, ok bool) {
 
 	// local time equal to UT.
 	// "YYYYMMDDHHmmSSZ" or
-	// "YYYYMMDDHHmmSSZ'" if relaxed
-	if o == 'Z' && (len(s) == 15 || (relaxed && len(s) == 16 && s[15] == '\'')) {
-		return 0, 0, true
+	// if relaxed
+	// 		"YYYYMMDDHHmmSSZ'"
+	// 		"YYYYMMDDHHmmSSZ'0"
+
+	if o == 'Z' {
+		t := s[15:]
+		if t == "" || relaxed && (t == "'" || t == "'0") {
+			return 0, 0, true
+		}
 	}
 
-	// HH'mm'
+	// HH'mm
 	s = s[15:]
 	if s[0] == '-' {
 		s = s[1:]
@@ -336,7 +342,7 @@ func digestPopularOutOfSpecDates(s string) (time.Time, bool) {
 // DateTime decodes s into a time.Time.
 func DateTime(s string, relaxed bool) (time.Time, bool) {
 	// 7.9.4 Dates
-	// (D:YYYYMMDDHHmmSSOHH'mm')
+	// (D:YYYYMMDDHHmmSSOHH'mm)
 
 	var d time.Time
 

diff --git a/pkg/pdfcpu/types/date_test.go b/pkg/pdfcpu/types/date_test.go
@@ -55,6 +55,9 @@ func doParseDateTimeFail(s string, t *testing.T) {
 
 func TestParseDateTime(t *testing.T) {
 
+	// (D:YYYYMMDDHHmmSSOHH'mm)
+	// O = -,+,Z
+
 	s := "D:2017"
 	doParseDateTimeOK(s, t)
 
@@ -80,13 +83,13 @@ func TestParseDateTime(t *testing.T) {
 	s = "D:20170430155901"
 	doParseDateTimeOK(s, t)
 
-	s = "D:20170430155901+06'59'"
+	s = "D:20170430155901+06'59"
 	doParseDateTimeOK(s, t)
 
 	s = "D:20170430155901Z00"
 	doParseDateTimeOK(s, t)
 
-	s = "D:20170430155901Z00'00'"
+	s = "D:20170430155901Z00'00"
 	doParseDateTimeOK(s, t)
 
 	s = "D:20210602180254-06"
@@ -101,12 +104,15 @@ func TestParseDateTime(t *testing.T) {
 	s = "D:20210515103719-02'00"
 	doParseDateTimeOK(s, t)
 
-	s = "D:20170430155901+66'A9'"
+	s = "D:20170430155901+66'A9"
 	doParseDateTimeFail(s, t)
 
 	s = "D:20201222164228Z'"
 	doParseDateTimeRelaxedOK(s, t)
 
+	s = "D:20230912144809Z'0"
+	doParseDateTimeRelaxedOK(s, t)
+
 	s = "20141117162446Z00'00'"
 	doParseDateTimeRelaxedOK(s, t)