actions
/
mdBook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1376 from dtolnay/html 

Escape `<` and `>` in rendered toc to match handlebars' escaping in <title>
This commit is contained in:
Eric Huss 2020-11-10 14:46:24 -08:00 committed by GitHub
parent 58f66a146d c712ba7aab
commit 07e72757d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/renderer/html_handlebars/helpers/toc.rs
View File

@ -1,4 +1,5 @@
use std::collections::BTreeMap;
use std::io;
use std::path::Path;
use crate::utils;
@ -102,7 +103,7 @@ impl HelperDef for RenderToc {
// Part title
if let Some(title) = item.get("part") {
out.write("<li class=\"part-title\">")?;
out.write(title)?;
write_escaped(out, title)?;
out.write("</li>")?;
continue;
}
@ -160,7 +161,7 @@ impl HelperDef for RenderToc {
html::push_html(&mut markdown_parsed_name, parser);
// write to the handlebars template
out.write(&markdown_parsed_name)?;
write_escaped(out, &markdown_parsed_name)?;
}
if path_exists {
@ -204,3 +205,18 @@ fn write_li_open_tag(
li.push_str("\">");
out.write(&li)
}
fn write_escaped(out: &mut dyn Output, mut title: &str) -> io::Result<()> {
let needs_escape: &[char] = &['<', '>'];
while let Some(next) = title.find(needs_escape) {
out.write(&title[..next])?;
match title.as_bytes()[next] {
b'<' => out.write("&lt;")?,
b'>' => out.write("&gt;")?,
_ => unreachable!(),
}
title = &title[next + 1..];
}
out.write(title)?;
Ok(())
}