about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorBarosl Lee <vcs@barosl.com>2015-10-08 07:25:59 +0900
committerBarosl Lee <vcs@barosl.com>2015-10-10 04:49:31 +0900
commitc7fa52df34cfc80f31cc41d797ad847e14e8dd8e (patch)
tree9b45350600843e7dc1d506bc9a8281be9e4c730d /src/libsyntax/parse
parente3376d8a134e52e1638eff37ed3c0d602a0483d7 (diff)
downloadrust-c7fa52df34cfc80f31cc41d797ad847e14e8dd8e.tar.gz
rust-c7fa52df34cfc80f31cc41d797ad847e14e8dd8e.zip
Prevent `/**/` from being parsed as a doc comment
Previously, `/**/` was incorrectly regarded as a doc comment because it
starts with `/**` and ends with `*/`. However, this caused an ICE
because some code assumed that the length of a doc comment is at least
5. This commit adds an additional check to `is_block_doc_comment` that
tests the length of the input.

Fixes #28844.
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/lexer/mod.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs
index a0e170b4ace..490822b934e 100644
--- a/src/libsyntax/parse/lexer/mod.rs
+++ b/src/libsyntax/parse/lexer/mod.rs
@@ -1385,8 +1385,9 @@ pub fn is_doc_comment(s: &str) -> bool {
 }
 
 pub fn is_block_doc_comment(s: &str) -> bool {
-    let res = (s.starts_with("/**") && *s.as_bytes().get(3).unwrap_or(&b' ') != b'*')
-              || s.starts_with("/*!");
+    let res = ((s.starts_with("/**") && *s.as_bytes().get(3).unwrap_or(&b' ') != b'*')
+               || s.starts_with("/*!"))
+              && s.len() >= 5; // Prevent `/**/` from being parsed as a doc comment
     debug!("is {:?} a doc comment? {}", s, res);
     res
 }