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

* fixed crash when childof was nil

Browse Source
This commit is contained in:
peter 1999-08-26 21:17:39 +00:00
parent cbd7de9e6f
commit 2f95239feb
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
compiler/pdecl.pas
View File

@ -1370,15 +1370,12 @@ unit pdecl;
if token=_LKLAMMER then
begin
consume(_LKLAMMER);
{ does not allow objects.tobject !! }
{if token<>ID then
consume(_ID);
getsym(pattern,true);}
childof:=pobjectdef(id_type(pattern));
if (childof^.deftype<>objectdef) then
begin
Message1(type_e_class_type_expected,childof^.typename);
childof:=nil;
aktclass:=new(pobjectdef,init(n,nil));
end
else
begin
@ -1386,23 +1383,22 @@ unit pdecl;
if (childof^.is_class and not is_a_class) or
(not childof^.is_class and is_a_class) then
Message(parser_e_mix_of_classes_and_objects);
end;
if assigned(fd) then
begin
{ the forward of the child must be resolved to get
correct field addresses
}
if (oo_is_forward in childof^.objectoptions) then
{ the forward of the child must be resolved to get
correct field addresses }
if assigned(fd) then
begin
if (oo_is_forward in childof^.objectoptions) then
Message1(parser_e_forward_declaration_must_be_resolved,childof^.objname^);
aktclass:=fd;
{ we must inherit several options !!
this was missing !!
all is now done in set_parent
including symtable datasize setting PM }
fd^.set_parent(childof);
end
else
aktclass:=new(pobjectdef,init(n,childof));
aktclass:=fd;
{ we must inherit several options !!
this was missing !!
all is now done in set_parent
including symtable datasize setting PM }
fd^.set_parent(childof);
end
else
aktclass:=new(pobjectdef,init(n,childof));
end;
consume(_RKLAMMER);
end
{ if no parent class, then a class get tobject as parent }
@ -2408,7 +2404,10 @@ unit pdecl;
end.
{
$Log$
Revision 1.144 1999-08-14 00:38:53 peter
Revision 1.145 1999-08-26 21:17:39 peter
* fixed crash when childof was nil
Revision 1.144 1999/08/14 00:38:53 peter
* hack to support property with record fields
Revision 1.143 1999/08/09 22:19:53 peter