maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix an infinite loop in comment lexer: we were not advancing in the input character stream when we saw a '<' that is not a start of an HTML tag. 

llvm-svn: 159303
This commit is contained in:
Dmitri Gribenko 2012-06-27 23:28:29 +00:00
parent ef40238a0e
commit 632d58afab
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/AST/CommentLexer.cpp
View File

@ -357,6 +357,11 @@ void Lexer::lexCommentText(Token &T) {
setupAndLexHTMLOpenTag(T); setupAndLexHTMLOpenTag(T);
else if (C == '/') else if (C == '/')
lexHTMLCloseTag(T); lexHTMLCloseTag(T);
else {
StringRef Text(BufferPtr, TokenPtr - BufferPtr);
formTokenWithChars(T, TokenPtr, tok::text);
T.setText(Text);
}
return; return;
} }

42
clang/unittests/AST/CommentLexer.cpp
View File

@ -683,6 +683,28 @@ TEST_F(CommentLexerTest, HTML1) {
} }
TEST_F(CommentLexerTest, HTML2) { TEST_F(CommentLexerTest, HTML2) {
const char *Source =
"// < tag";
std::vector<Token> Toks;
lexString(Source, Toks);
ASSERT_EQ(4U, Toks.size());
ASSERT_EQ(tok::text, Toks[0].getKind());
ASSERT_EQ(StringRef(" "), Toks[0].getText());
ASSERT_EQ(tok::text, Toks[1].getKind());
ASSERT_EQ(StringRef("<"), Toks[1].getText());
ASSERT_EQ(tok::text, Toks[2].getKind());
ASSERT_EQ(StringRef(" tag"), Toks[2].getText());
ASSERT_EQ(tok::newline, Toks[3].getKind());
}
TEST_F(CommentLexerTest, HTML3) {
const char *Sources[] = { const char *Sources[] = {
"// <tag", "// <tag",
"// <tag " "// <tag "
@ -705,7 +727,7 @@ TEST_F(CommentLexerTest, HTML2) {
} }
} }
TEST_F(CommentLexerTest, HTML3) { TEST_F(CommentLexerTest, HTML4) {
const char *Source = "// <tag="; const char *Source = "// <tag=";
std::vector<Token> Toks; std::vector<Token> Toks;
@ -726,7 +748,7 @@ TEST_F(CommentLexerTest, HTML3) {
ASSERT_EQ(tok::newline, Toks[3].getKind()); ASSERT_EQ(tok::newline, Toks[3].getKind());
} }
TEST_F(CommentLexerTest, HTML4) { TEST_F(CommentLexerTest, HTML5) {
const char *Sources[] = { const char *Sources[] = {
"// <tag attr", "// <tag attr",
"// <tag attr " "// <tag attr "
@ -752,7 +774,7 @@ TEST_F(CommentLexerTest, HTML4) {
} }
} }
TEST_F(CommentLexerTest, HTML5) { TEST_F(CommentLexerTest, HTML6) {
const char *Sources[] = { const char *Sources[] = {
"// <tag attr=", "// <tag attr=",
"// <tag attr =" "// <tag attr ="
@ -780,7 +802,7 @@ TEST_F(CommentLexerTest, HTML5) {
} }
} }
TEST_F(CommentLexerTest, HTML6) { TEST_F(CommentLexerTest, HTML7) {
const char *Sources[] = { const char *Sources[] = {
"// <tag attr=\"", "// <tag attr=\"",
"// <tag attr = \"", "// <tag attr = \"",
@ -813,7 +835,7 @@ TEST_F(CommentLexerTest, HTML6) {
} }
} }
TEST_F(CommentLexerTest, HTML7) { TEST_F(CommentLexerTest, HTML8) {
const char *Source = "// <tag attr=@"; const char *Source = "// <tag attr=@";
std::vector<Token> Toks; std::vector<Token> Toks;
@ -839,7 +861,7 @@ TEST_F(CommentLexerTest, HTML7) {
ASSERT_EQ(tok::newline, Toks[5].getKind()); ASSERT_EQ(tok::newline, Toks[5].getKind());
} }
TEST_F(CommentLexerTest, HTML8) { TEST_F(CommentLexerTest, HTML9) {
const char *Sources[] = { const char *Sources[] = {
"// <tag attr=\"val\\\"\\'val", "// <tag attr=\"val\\\"\\'val",
"// <tag attr=\"val\\\"\\'val\"", "// <tag attr=\"val\\\"\\'val\"",
@ -872,7 +894,7 @@ TEST_F(CommentLexerTest, HTML8) {
} }
} }
TEST_F(CommentLexerTest, HTML9) { TEST_F(CommentLexerTest, HTML10) {
const char *Sources[] = { const char *Sources[] = {
"// <tag attr=\"val\\\"\\'val\">", "// <tag attr=\"val\\\"\\'val\">",
"// <tag attr=\'val\\\"\\'val\'>" "// <tag attr=\'val\\\"\\'val\'>"
@ -905,7 +927,7 @@ TEST_F(CommentLexerTest, HTML9) {
} }
} }
TEST_F(CommentLexerTest, HTML10) { TEST_F(CommentLexerTest, HTML11) {
const char *Source = "// </"; const char *Source = "// </";
std::vector<Token> Toks; std::vector<Token> Toks;
@ -924,7 +946,7 @@ TEST_F(CommentLexerTest, HTML10) {
} }
TEST_F(CommentLexerTest, HTML11) { TEST_F(CommentLexerTest, HTML12) {
const char *Source = "// </@"; const char *Source = "// </@";
std::vector<Token> Toks; std::vector<Token> Toks;
@ -945,7 +967,7 @@ TEST_F(CommentLexerTest, HTML11) {
ASSERT_EQ(tok::newline, Toks[3].getKind()); ASSERT_EQ(tok::newline, Toks[3].getKind());
} }
TEST_F(CommentLexerTest, HTML12) { TEST_F(CommentLexerTest, HTML13) {
const char *Sources[] = { const char *Sources[] = {
"// </tag", "// </tag",
"// </tag>", "// </tag>",