about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-10-10 02:29:37 +0000
committerbors <bors@rust-lang.org>2015-10-10 02:29:37 +0000
commitb6fd615b8ab0b5b1ccdbe089afb03c4be04cc450 (patch)
tree33bbda0a0e50d4e8a41bdfefe30617a17b760ee0 /src/libsyntax
parent87cd2c08273dec5c8db8e59f4231b8e69aa9b85b (diff)
parentc7fa52df34cfc80f31cc41d797ad847e14e8dd8e (diff)
downloadrust-b6fd615b8ab0b5b1ccdbe089afb03c4be04cc450.tar.gz
rust-b6fd615b8ab0b5b1ccdbe089afb03c4be04cc450.zip
Auto merge of #28932 - barosl:empty-comment, r=alexcrichton
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')
-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
 }