paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-30 03:50:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

JCF2: Fix a range check error at the end of file.

Browse Source 
git-svn-id: trunk@46059 -
This commit is contained in:
juha 2014-08-22 17:25:11 +00:00
parent daaa427f54
commit feb85653da
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/jcf2/Parse/BuildTokenList.pas
View File

@ -59,7 +59,7 @@ type
function EndOfFile: boolean;
function EndOfFileAfter(const piChars: integer): boolean;
{ implementation of GetNextToken }
{ implementation of GetNextToken }
function TryReturn(const pcToken: TSourceToken): boolean;
function TryCurlyComment(const pcToken: TSourceToken): boolean;
@ -361,20 +361,21 @@ begin
if not WideCharIsReturn(Current) then
exit;
Result := True;
pcToken.TokenType := ttReturn;
pcToken.SourceCode := Current;
Consume;
if fiCurrentIndex > Length(fsSourceCode) then
exit;
{ concat the next return char if it is not the same
This will recognise <cr><lf> or <lf><cr>, but not <cr><cr> }
chNext := Current;
if WideCharIsReturn(chNext) and (chNext <> pcToken.SourceCode[1]) then
begin
pcToken.SourceCode := pcToken.SourceCode + chNext;
Consume;
end;
Result := True;
end;
{ complexities like 'Hello'#32'World' and #$12'Foo' are assemlbed in the parser }