Skip to content

Fix compiler state corruption after an exception in the OnUses handler #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TetzkatLipHoka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compiler state corruption after an exception in the OnUses handler #300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Source/uPSCompiler.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12593,8 +12593,14 @@ function TPSPascalCompiler.Compile(const s: tbtString): Boolean;
except
on e: Exception do
begin
MakeError('', ecCustomError, tbtstring(e.Message));
{$IFNDEF PS_USESSUPPORT}
MakeError('', ecCustomError, tbtstring(e.Message)); // still attributed to the used unit
{$IFDEF PS_USESSUPPORT}
// restore what the regular failure path above restores: a stale
// fModule survives Cleanup and makes every following Compile of
// this instance fail with a bogus cross-reference error
FParser:=ParserPos;
fModule:=OldFileName;
{$ELSE}
FUses.Free;
{$ENDIF}
Result := False;
Expand Down