Use HandleError instead of RunError in fpc_help_destructor, fpc_check_object and fpc_check_object_ext

git-svn-id: trunk@36113 -
This commit is contained in:
pierre 2017-05-05 11:49:16 +00:00
parent 85fbbec319
commit d2d1794b40

View File

@ -793,7 +793,7 @@ begin
exit; exit;
if (pobjectvmt(ppointer(_self+vmt_pos)^)^.size=0) or if (pobjectvmt(ppointer(_self+vmt_pos)^)^.size=0) or
(pobjectvmt(ppointer(_self+vmt_pos)^)^.size+pobjectvmt(ppointer(_self+vmt_pos)^)^.msize<>0) then (pobjectvmt(ppointer(_self+vmt_pos)^)^.size+pobjectvmt(ppointer(_self+vmt_pos)^)^.msize<>0) then
RunError(210); HandleError(210);
{ reset vmt to nil for protection } { reset vmt to nil for protection }
ppointer(_self+vmt_pos)^:=nil; ppointer(_self+vmt_pos)^:=nil;
freemem(_self); freemem(_self);
@ -832,7 +832,7 @@ begin
if (_vmt=nil) or if (_vmt=nil) or
(pobjectvmt(_vmt)^.size=0) or (pobjectvmt(_vmt)^.size=0) or
(pobjectvmt(_vmt)^.size+pobjectvmt(_vmt)^.msize<>0) then (pobjectvmt(_vmt)^.size+pobjectvmt(_vmt)^.msize<>0) then
RunError(210); HandleError(210);
end; end;
{$endif ndef FPC_SYSTEM_HAS_FPC_CHECK_OBJECT} {$endif ndef FPC_SYSTEM_HAS_FPC_CHECK_OBJECT}
@ -847,7 +847,7 @@ begin
if (vmt=nil) or if (vmt=nil) or
(pobjectvmt(vmt)^.size=0) or (pobjectvmt(vmt)^.size=0) or
(pobjectvmt(vmt)^.size+pobjectvmt(vmt)^.msize<>0) then (pobjectvmt(vmt)^.size+pobjectvmt(vmt)^.msize<>0) then
RunError(210); HandleError(210);
while assigned(vmt) do while assigned(vmt) do
if vmt=expvmt then if vmt=expvmt then
exit exit
@ -860,7 +860,7 @@ begin
else else
vmt:=nil; vmt:=nil;
{$endif} {$endif}
RunError(219); HandleError(219);
end; end;
{$endif not FPC_SYSTEM_HAS_FPC_CHECK_OBJECT_EXT} {$endif not FPC_SYSTEM_HAS_FPC_CHECK_OBJECT_EXT}