paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-05 18:08:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed internal linker entering infinite loop if script contains empty lines or comments.

Browse Source 
git-svn-id: trunk@21650 -
This commit is contained in:
sergei 2012-06-18 17:03:35 +00:00
parent c5fbe3bb3b
commit a2f0e54dc6
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/link.pas
View File

@ -531,15 +531,11 @@ Implementation
end; end;
procedure AddImportSymbol(const libname,symname,symmangledname:TCmdStr;OrdNr: longint;isvar:boolean);
begin
end;
procedure TLinker.InitSysInitUnitName; procedure TLinker.InitSysInitUnitName;
begin begin
end; end;
function TLinker.MakeExecutable:boolean; function TLinker.MakeExecutable:boolean;
begin begin
MakeExecutable:=false; MakeExecutable:=false;
@ -951,7 +947,10 @@ Implementation
inc(i); inc(i);
s:=hp.str; s:=hp.str;
if (s='') or (s[1]='#') then if (s='') or (s[1]='#') then
continue; begin
hp:=TCmdStrListItem(hp.next);
continue;
end;
keyword:=Upper(GetToken(s,' ')); keyword:=Upper(GetToken(s,' '));
para:=GetToken(s,' '); para:=GetToken(s,' ');
if Trim(s)<>'' then if Trim(s)<>'' then
@ -1037,6 +1036,7 @@ Implementation
if (s='') or (s[1]='#') then if (s='') or (s[1]='#') then
begin begin
IsHandled^[i]:=true; IsHandled^[i]:=true;
hp:=TCmdStrListItem(hp.next);
continue; continue;
end; end;
handled:=true; handled:=true;
@ -1084,7 +1084,10 @@ Implementation
inc(i); inc(i);
s:=hp.str; s:=hp.str;
if (s='') or (s[1]='#') then if (s='') or (s[1]='#') then
continue; begin
hp:=TCmdStrListItem(hp.next);
continue;
end;
handled:=true; handled:=true;
keyword:=Upper(GetToken(s,' ')); keyword:=Upper(GetToken(s,' '));
para:=ParsePara(GetToken(s,' ')); para:=ParsePara(GetToken(s,' '));
@ -1136,7 +1139,10 @@ Implementation
inc(i); inc(i);
s:=hp.str; s:=hp.str;
if (s='') or (s[1]='#') then if (s='') or (s[1]='#') then
continue; begin
hp:=TCmdStrListItem(hp.next);
continue;
end;
handled:=true; handled:=true;
keyword:=Upper(GetToken(s,' ')); keyword:=Upper(GetToken(s,' '));
para:=ParsePara(GetToken(s,' ')); para:=ParsePara(GetToken(s,' '));
@ -1172,7 +1178,10 @@ Implementation
inc(i); inc(i);
s:=hp.str; s:=hp.str;
if (s='') or (s[1]='#') then if (s='') or (s[1]='#') then
continue; begin
hp:=TCmdStrListItem(hp.next);
continue;
end;
handled:=true; handled:=true;
keyword:=Upper(GetToken(s,' ')); keyword:=Upper(GetToken(s,' '));
para:=ParsePara(GetToken(s,' ')); para:=ParsePara(GetToken(s,' '));