OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #17796 : tomjakubowski/rust/rustdoc-ice-17736, r=alexcrichton 

Previously, external code might call `markdown::render()` without having
called `markdown::reset_headers()`, meaning the TLS key
`used_header_map` was unset.  Now `markdown::render()` ensures that
`used_header_map` is set by calling `reset_headers` if necessary.

Fix #17736
This commit is contained in:
bors 2014-10-06 14:57:19 +00:00
parent 0d94fdaeb8 942bed7aa6
commit 3edcdbb0c0
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/librustdoc/html/markdown.rs
View File

@ -268,6 +268,10 @@ pub fn render(w: &mut fmt::Formatter, s: &str, print_toc: bool) -> fmt::Result {
text.with_c_str(|p| unsafe { hoedown_buffer_puts(ob, p) });
}
if used_header_map.get().is_none() {
reset_headers();
}
unsafe {
let ob = hoedown_buffer_new(DEF_OUNIT);
let renderer = hoedown_html_renderer_new(0, 0);
@ -446,7 +450,7 @@ impl<'a> fmt::Show for MarkdownWithToc<'a> {
#[cfg(test)]
mod tests {
use super::LangString;
use super::{LangString, Markdown};
#[test]
fn test_lang_string_parse() {
@ -474,4 +478,10 @@ mod tests {
t("{.example .rust}", false,false,false,false,false);
t("{.test_harness .rust}", false,false,false,false,true);
}
#[test]
fn issue_17736() {
let markdown = "# title";
format!("{}", Markdown(markdown.as_slice()));
}
}