paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 20:11:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed crash with settextbuf,ptr

Browse Source
This commit is contained in:
peter 2000-11-11 16:14:52 +00:00
parent 6ab0380cd9
commit 512b1fcc74
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
compiler/ncal.pas
View File

@ -549,7 +549,7 @@ interface
pd : pprocdef; pd : pprocdef;
oldcallprocsym : pprocsym; oldcallprocsym : pprocsym;
def_from,def_to,conv_to : pdef; def_from,def_to,conv_to : pdef;
hpt,inlinecode : tnode; hpt,hpt2,inlinecode : tnode;
pt : tcallparanode; pt : tcallparanode;
exactmatch,inlined : boolean; exactmatch,inlined : boolean;
paralength,lastpara : longint; paralength,lastpara : longint;
@ -1248,22 +1248,16 @@ interface
begin begin
if assigned(left) then if assigned(left) then
begin begin
{ settextbuf needs two args } hpt2:=left;
if assigned(tcallparanode(left).right) then left:=nil;
hpt:=geninlinenode(pprocdef(procdefinition)^.extnumber,is_const,left) { ptr and settextbuf needs two args }
if assigned(tcallparanode(hpt2).right) then
hpt:=geninlinenode(pprocdef(procdefinition)^.extnumber,is_const,hpt2)
else else
begin hpt:=geninlinenode(pprocdef(procdefinition)^.extnumber,is_const,tcallparanode(hpt2).left);
hpt:=geninlinenode(pprocdef(procdefinition)^.extnumber,is_const,
tcallparanode(left).left);
tcallparanode(left).left:=nil;
left.free;
left:=nil;
end;
end end
else else
begin hpt:=geninlinenode(pprocdef(procdefinition)^.extnumber,is_const,nil);
hpt:=geninlinenode(pprocdef(procdefinition)^.extnumber,is_const,nil);
end;
firstpass(hpt); firstpass(hpt);
pass_1:=hpt; pass_1:=hpt;
goto errorexit; goto errorexit;
@ -1545,7 +1539,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.15 2000-11-06 21:36:25 peter Revision 1.16 2000-11-11 16:14:52 peter
* fixed crash with settextbuf,ptr
Revision 1.15 2000/11/06 21:36:25 peter
* fixed var parameter varstate bug * fixed var parameter varstate bug
Revision 1.14 2000/11/04 14:25:20 florian Revision 1.14 2000/11/04 14:25:20 florian
@ -1594,4 +1591,4 @@ end.
Revision 1.1 2000/09/20 20:52:16 florian Revision 1.1 2000/09/20 20:52:16 florian
* initial revision * initial revision
} }