fix:adding more than 10 images will cause loop infinite (#29)

bobiverse · Mar 31, 2024 · 28214b5 · 28214b5
1 parent 3dde65b
commit 28214b5
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 1 deletion.
diff --git a/Template.go b/Template.go
@@ -422,7 +422,7 @@ func (t *Template) replaceSingleParams(xnode *xmlNode, triggerParamOnly bool) {
 					return
 				}
 				// Prefix check
-				if !bytes.Contains(n.Content, []byte(p.PlaceholderPrefix())) {
+				if !n.ContentHasPrefix(p.PlaceholderPrefix()) {
 					return
 				}
 				// Trigger: does placeholder have trigger

diff --git a/t.docx_test.go b/t.docx_test.go
@@ -64,6 +64,66 @@ func TestPlaceholders(t *testing.T) {
 				Width:  25,
 				Height: 25,
 			},
+			{
+				Path:   "images/avatar-3.png",
+				Width:  25,
+				Height: 25,
+			},
+			{
+				Path:   "images/avatar-3.png",
+				Width:  25,
+				Height: 25,
+			},
+			{
+				Path:   "images/avatar-3.png",
+				Width:  25,
+				Height: 25,
+			},
+			{
+				Path:   "images/avatar-3.png",
+				Width:  25,
+				Height: 25,
+			},
+			{
+				Path:   "images/avatar-3.png",
+				Width:  25,
+				Height: 25,
+			},
+			{
+				Path:   "images/avatar-3.png",
+				Width:  25,
+				Height: 25,
+			},
+			{
+				Path:   "images/avatar-3.png",
+				Width:  25,
+				Height: 25,
+			},
+			{
+				Path:   "images/avatar-3.png",
+				Width:  25,
+				Height: 25,
+			},
+			{
+				Path:   "images/avatar-3.png",
+				Width:  25,
+				Height: 25,
+			},
+			{
+				Path:   "images/avatar-3.png",
+				Width:  25,
+				Height: 25,
+			},
+			{
+				Path:   "images/avatar-3.png",
+				Width:  25,
+				Height: 25,
+			},
+			{
+				Path:   "images/avatar-3.png",
+				Width:  25,
+				Height: 25,
+			},
 		},
 	}
 

diff --git a/xml.node.go b/xml.node.go
@@ -33,6 +33,15 @@ type xmlNode struct {
 	isDeleted bool
 }
 
+func (xnode xmlNode) ContentHasPrefix(str string) bool {
+	splitContent :=bytes.Split(xnode.Content, []byte(str))
+	if len(splitContent) == 1{
+		return false
+	}
+	contentSuffix := splitContent[1]
+	return bytes.HasPrefix(contentSuffix, []byte{'.'}) || bytes.HasPrefix(contentSuffix, []byte{'}', '}'}) || bytes.HasPrefix(contentSuffix, []byte{' '})
+}
+
 // UnmarshalXML ..
 func (xnode *xmlNode) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
 	// n.Attrs = start.Attr