forked from OSchip/llvm-project
[MC] Fix compiler crash in AsmParser::Lex
When an empty comment is present in an assembly file, the compiler will crash because it checks the first character for '\n' or '\r'. The fix consists of also checking if the string is empty before accessing the *front* method of the StringRef. A test is included for the x86 target, but this issue is reproducible with other targets as well. Patch by Alexandru Guduleasa! Reviewers: niravd, grosbach, llvm-commits Reviewed By: niravd Differential Revision: https://reviews.llvm.org/D33993 llvm-svn: 305077
This commit is contained in:
parent
24f7101876
commit
670109d89a
|
@ -703,7 +703,7 @@ const AsmToken &AsmParser::Lex() {
|
|||
// if it's a end of statement with a comment in it
|
||||
if (getTok().is(AsmToken::EndOfStatement)) {
|
||||
// if this is a line comment output it.
|
||||
if (getTok().getString().front() != '\n' &&
|
||||
if (!getTok().getString().empty() && getTok().getString().front() != '\n' &&
|
||||
getTok().getString().front() != '\r' && MAI.preserveAsmComments())
|
||||
Out.addExplicitComment(Twine(getTok().getString()));
|
||||
}
|
||||
|
@ -1523,7 +1523,7 @@ bool AsmParser::parseStatement(ParseStatementInfo &Info,
|
|||
Lex();
|
||||
if (Lexer.is(AsmToken::EndOfStatement)) {
|
||||
// if this is a line comment we can drop it safely
|
||||
if (getTok().getString().front() == '\r' ||
|
||||
if (getTok().getString().empty() || getTok().getString().front() == '\r' ||
|
||||
getTok().getString().front() == '\n')
|
||||
Out.AddBlankLine();
|
||||
Lex();
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
#RUN: llvm-mc -preserve-comments -n -triple i386-linux-gnu < %s > %t
|
||||
.text
|
||||
foo:
|
||||
nop #
|
Loading…
Reference in New Issue