about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsteveklabnik <steve@steveklabnik.com>2018-07-07 10:45:45 -0600
committerMark Rousskov <mark.simulacrum@gmail.com>2018-07-07 10:47:04 -0600
commit0d2d842eec9e35dd25bbdd0304ec9e08d320d29d (patch)
tree3018f3e0ce6b84c4431c7e4293de8ec95ad3d404
parente11d9ddb7d53ae13df447ddb1ebfd2fe380fde88 (diff)
downloadrust-0d2d842eec9e35dd25bbdd0304ec9e08d320d29d.tar.gz
rust-0d2d842eec9e35dd25bbdd0304ec9e08d320d29d.zip
Apply security patch for rustdoc
CVE number has not yet been assigned, patch made by steveklabnik.
-rw-r--r--src/librustdoc/lib.rs8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 059d4169895..19bfc74063e 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -681,8 +681,14 @@ where R: 'static + Send,
             }
         }
 
+        if !plugins.is_empty() && plugin_path.is_none() {
+            eprintln!("ERROR: You must pass --plugin-path to use --plugins");
+            std::process::exit(1);
+        }
+
+
         // Load all plugins/passes into a PluginManager
-        let path = plugin_path.unwrap_or("/tmp/rustdoc/plugins".to_string());
+        let path = plugin_path.unwrap_or("/usr/lib64/rustdoc/plugins".to_string());
         let mut pm = plugins::PluginManager::new(PathBuf::from(path));
         for pass in &passes {
             let plugin = match passes::PASSES.iter()