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

robustify the conflict marker stuff. Don't add 7 twice, which would 

make it miss (invalid) things like:
<<<<<<<
>>>>>>>

and crash if 

<<<<<<< 

was at the end of the line.  When we find a >>>>>>> that is not at the
end of the line, make sure to reset Pos so we don't crash on something
like:
<<<<<<< >>>>>>>

This isn't worth making testcases for, since each would require a new file.

rdar://7987078 - signal 11 compiling "<<<<<<<<<<"

llvm-svn: 103968
This commit is contained in:
Chris Lattner 2010-05-17 20:27:25 +00:00
parent 0ed7549343
commit 467f6bcfe5
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Lex/Lexer.cpp
View File

@ -1422,6 +1422,7 @@ static const char *FindConflictEnd(const char *CurPtr, const char *BufferEnd) {
if (RestOfBuffer[Pos-1] != '\r' &&
RestOfBuffer[Pos-1] != '\n') {
RestOfBuffer = RestOfBuffer.substr(Pos+7);
Pos = RestOfBuffer.find(">>>>>>>");
continue;
}
return RestOfBuffer.data()+Pos;
@ -1451,7 +1452,7 @@ bool Lexer::IsStartOfConflictMarker(const char *CurPtr) {
// Check to see if there is a >>>>>>> somewhere in the buffer at the start of
// a line to terminate this conflict marker.
if (FindConflictEnd(CurPtr+7, BufferEnd)) {
if (FindConflictEnd(CurPtr, BufferEnd)) {
// We found a match. We are really in a conflict marker.
// Diagnose this, and ignore to the end of line.
Diag(CurPtr, diag::err_conflict_marker);

5
clang/test/Lexer/conflict-marker.c
View File

@ -4,7 +4,7 @@
// PR5238
// diff3 style
<<<<<<< .mine // expected-error {{version control conflict marker in file}}
<<<<<<< .mine // expected-error {{version control conflict marker in file}}
int x = 4;
|||||||
int x = 123;
@ -13,7 +13,7 @@ float x = 17;
>>>>>>> .r91107
// normal style.
<<<<<<< .mine // expected-error {{version control conflict marker in file}}
<<<<<<< .mine // expected-error {{version control conflict marker in file}}
typedef int y;
=======
typedef struct foo *y;
@ -22,6 +22,7 @@ typedef struct foo *y;
;
y b;
int foo() {
y a = x;
return x + a;