lavender-legacy/gitea
7
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use html.Parse rather than html.ParseFragment (#16223)

Browse source 
* Use html.Parse rather than html.ParseFragment
  There have been a few issues with html.ParseFragment - just use html.Parse instead.

* Skip document node

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2021-06-21 23:12:22 +01:00 committed by GitHub
parent 36c158bc93
commit d55b5eb0d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/markup/html.go
View file

@ -304,27 +304,26 @@ func postProcess(ctx *RenderContext, procs []processor, input io.Reader, output
_, _ = res.WriteString("</body></html>") _, _ = res.WriteString("</body></html>")
// parse the HTML // parse the HTML
nodes, err := html.ParseFragment(res, nil) node, err := html.Parse(res)
if err != nil { if err != nil {
return &postProcessError{"invalid HTML", err} return &postProcessError{"invalid HTML", err}
} }
for _, node := range nodes { if node.Type == html.DocumentNode {
visitNode(ctx, procs, node, true) node = node.FirstChild
} }
newNodes := make([]*html.Node, 0, len(nodes)) visitNode(ctx, procs, node, true)
for _, node := range nodes { newNodes := make([]*html.Node, 0, 5)
if node.Data == "html" {
node = node.FirstChild if node.Data == "html" {
for node != nil && node.Data != "body" { node = node.FirstChild
node = node.NextSibling for node != nil && node.Data != "body" {
} node = node.NextSibling
}
if node == nil {
continue
} }
}
if node != nil {
if node.Data == "body" { if node.Data == "body" {
child := node.FirstChild child := node.FirstChild
for child != nil { for child != nil {