call halt(217) if get_caller_XX function generates an exception

git-svn-id: trunk@22389 -
This commit is contained in:
pierre 2012-09-14 13:45:31 +00:00
parent 6ac8b6e9c7
commit 6eccf88499

View File

@ -144,7 +144,7 @@ begin
prev_frame:=get_caller_frame(curr_addr, curr_frame);
{$ifdef FPC_CHECK_GET_CALLER_EXCEPTIONS}
except
prev_frame:=nil;
halt(217);
end;
{$endif FPC_CHECK_GET_CALLER_EXCEPTIONS}
while (framecount<RaiseMaxFrameCount) and (curr_frame > prev_frame) and
@ -154,12 +154,12 @@ begin
try
caller_addr := get_caller_addr(curr_frame, curr_addr);
except
caller_addr := nil;
halt(217);
end;
try
caller_frame := get_caller_frame(curr_frame, curr_addr);
except
caller_frame := nil;
halt(217);
end;
{$else not FPC_CHECK_GET_CALLER_EXCEPTIONS}
caller_addr := get_caller_addr(curr_frame, curr_addr);