From c7fa52df34cfc80f31cc41d797ad847e14e8dd8e Mon Sep 17 00:00:00 2001 From: Barosl Lee Date: Thu, 8 Oct 2015 07:25:59 +0900 Subject: 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. --- src/libsyntax/parse/lexer/mod.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/libsyntax') 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 } -- cgit 1.4.1-3-g733a5