bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Prevent generation of infinite redirections

Browse source
This commit is contained in:
Guillaume Gomez 2022-02-22 15:20:57 +01:00
parent b8967b0d52
commit a849857bda
1 changed files with 35 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/librustdoc/html/render/context.rs
View file

@ -201,6 +201,8 @@ impl<'tcx> Context<'tcx> {
} else { } else {
tyname.as_str() tyname.as_str()
}; };
if !self.render_redirect_pages {
let page = layout::Page { let page = layout::Page {
css_class: tyname_s, css_class: tyname_s,
root_path: &self.root_path(), root_path: &self.root_path(),
@ -212,8 +214,6 @@ impl<'tcx> Context<'tcx> {
extra_scripts: &[], extra_scripts: &[],
static_extra_scripts: &[], static_extra_scripts: &[],
}; };
if !self.render_redirect_pages {
layout::render( layout::render(
&self.shared.layout, &self.shared.layout,
&page, &page,
@ -223,6 +223,13 @@ impl<'tcx> Context<'tcx> {
) )
} else { } else {
if let Some(&(ref names, ty)) = self.cache().paths.get(&it.def_id.expect_def_id()) { if let Some(&(ref names, ty)) = self.cache().paths.get(&it.def_id.expect_def_id()) {
if self.current.len() + 1 != names.len()
|| self.current.iter().zip(names.iter()).any(|(a, b)| a != b)
{
// We checked that the redirection isn't pointing to the current file,
// preventing an infinite redirection loop in the generated
// documentation.
let mut path = String::new(); let mut path = String::new();
for name in &names[..names.len() - 1] { for name in &names[..names.len() - 1] {
path.push_str(&name.as_str()); path.push_str(&name.as_str());
@ -242,6 +249,7 @@ impl<'tcx> Context<'tcx> {
None => return layout::redirect(&format!("{}{}", self.root_path(), path)), None => return layout::redirect(&format!("{}{}", self.root_path(), path)),
} }
} }
}
String::new() String::new()
} }
} }