summaryrefslogtreecommitdiffstats
path: root/markup/goldmark/render_hooks.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2023-05-30 13:21:45 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2023-05-30 15:03:54 +0200
commit3f497d496fcb002e18cd339c5850a300346b2f35 (patch)
treea7a1535796297e0bc7ecac4e4cca8c75f8e6fa3a /markup/goldmark/render_hooks.go
parent32585696be70dba987dbad299b22a05f9a820a49 (diff)
Prevent double escaping of image alt-text in Goldmar typographer
Fixes #11045
Diffstat (limited to 'markup/goldmark/render_hooks.go')
-rw-r--r--markup/goldmark/render_hooks.go17
1 files changed, 16 insertions, 1 deletions
diff --git a/markup/goldmark/render_hooks.go b/markup/goldmark/render_hooks.go
index 0bd800dc0..60a3a1efe 100644
--- a/markup/goldmark/render_hooks.go
+++ b/markup/goldmark/render_hooks.go
@@ -225,7 +225,7 @@ func (r *hookedRenderer) renderImageDefault(w util.BufWriter, source []byte, nod
_, _ = w.Write(util.EscapeHTML(util.URLEscape(n.Destination, true)))
}
_, _ = w.WriteString(`" alt="`)
- _, _ = w.Write(util.EscapeHTML(n.Text(source)))
+ _, _ = w.Write(nodeToHTMLText(n, source))
_ = w.WriteByte('"')
if n.Title != nil {
_, _ = w.WriteString(` title="`)
@@ -475,3 +475,18 @@ func (e *links) Extend(m goldmark.Markdown) {
util.Prioritized(newLinkRenderer(e.cfg), 100),
))
}
+
+// Borrowed from Goldmark.
+func nodeToHTMLText(n ast.Node, source []byte) []byte {
+ var buf bytes.Buffer
+ for c := n.FirstChild(); c != nil; c = c.NextSibling() {
+ if s, ok := c.(*ast.String); ok && s.IsCode() {
+ buf.Write(s.Text(source))
+ } else if !c.HasChildren() {
+ buf.Write(util.EscapeHTML(c.Text(source)))
+ } else {
+ buf.Write(nodeToHTMLText(c, source))
+ }
+ }
+ return buf.Bytes()
+}