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

pas2js: fixed crash on class function

Browse Source 
git-svn-id: trunk@45830 -
This commit is contained in:
Mattias Gaertner 2020-07-23 11:04:47 +00:00
parent 9f60f5093d
commit c1fe90524c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/pastojs/src/fppas2js.pp
View File

@ -3274,6 +3274,7 @@ begin
exit(false); // there is no overload exit(false); // there is no overload
if (El.ClassType=TPasClassFunction) if (El.ClassType=TPasClassFunction)
and (El.Parent.ClassType=TPasClassType)
and (TPas2JSClassScope(TPasClassType(El.Parent).CustomData).NewInstanceFunction=El) then and (TPas2JSClassScope(TPasClassType(El.Parent).CustomData).NewInstanceFunction=El) then
begin begin
Duplicate:=GetDuplicate; Duplicate:=GetDuplicate;
@ -3542,6 +3543,8 @@ var
Scope: TPasIdentifierScope; Scope: TPasIdentifierScope;
begin begin
i:=FOverloadScopes.Count-1; i:=FOverloadScopes.Count-1;
if i<0 then
RaiseInternalError(20200723125456);
Scope:=TPasIdentifierScope(FOverloadScopes[i]); Scope:=TPasIdentifierScope(FOverloadScopes[i]);
if Scope.ClassType=TPas2JSOverloadChgThisScope then if Scope.ClassType=TPas2JSOverloadChgThisScope then
Scope.Free; Scope.Free;