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

compiler: don't allow unit/namespace symbols be visible outside current unit or unit of currently specialized generic

Browse Source 
git-svn-id: trunk@25559 -
This commit is contained in:
paul 2013-09-25 00:29:56 +00:00
parent 44b141ea1a
commit d373ad27bc
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
compiler/symtable.pas
View File

@ -1320,7 +1320,7 @@ implementation
function tabstractrecordsymtable.iscurrentunit: boolean; function tabstractrecordsymtable.iscurrentunit: boolean;
begin begin
Result := Assigned(current_module) and (current_module.moduleid=moduleid); Result:=assigned(current_module)and(current_module.moduleid=moduleid);
end; end;
{**************************************************************************** {****************************************************************************
@ -1814,7 +1814,7 @@ implementation
function tspecializesymtable.iscurrentunit: boolean; function tspecializesymtable.iscurrentunit: boolean;
begin begin
Result := true; Result:=true;
end; end;
@ -2335,9 +2335,9 @@ implementation
function searchsym_maybe_with_symoption(const s : TIDString;out srsym:tsym;out srsymtable:TSymtable;flags:tsymbol_search_flags;option:tsymoption):boolean; function searchsym_maybe_with_symoption(const s : TIDString;out srsym:tsym;out srsymtable:TSymtable;flags:tsymbol_search_flags;option:tsymoption):boolean;
var var
hashedid : THashedIDString; hashedid: THashedIDString;
contextstructdef : tabstractrecorddef; contextstructdef: tabstractrecorddef;
stackitem : psymtablestackitem; stackitem: psymtablestackitem;
begin begin
result:=false; result:=false;
hashedid.id:=s; hashedid.id:=s;
@ -2363,7 +2363,16 @@ implementation
(srsymtable.defowner.typ=undefineddef)) then (srsymtable.defowner.typ=undefineddef)) then
begin begin
srsym:=tsym(srsymtable.FindWithHash(hashedid)); srsym:=tsym(srsymtable.FindWithHash(hashedid));
if assigned(srsym) then { First check if it is a unit/namespace symbol.
They are visible only if they are from the current unit or
unit of generic of currently processed specialization. }
if assigned(srsym) and
(
not(srsym.typ in [unitsym,namespacesym]) or
srsymtable.iscurrentunit or
(assigned(current_specializedef)and(current_specializedef.genericdef.owner.moduleid=srsymtable.moduleid))
) and
(not (ssf_search_option in flags) or (option in srsym.symoptions))then
begin begin
{ use the class from withsymtable only when it is { use the class from withsymtable only when it is
defined in this unit } defined in this unit }
@ -2375,9 +2384,8 @@ implementation
contextstructdef:=tabstractrecorddef(srsymtable.defowner) contextstructdef:=tabstractrecorddef(srsymtable.defowner)
else else
contextstructdef:=current_structdef; contextstructdef:=current_structdef;
if not (srsym.owner.symtabletype in [objectsymtable,recordsymtable]) or if not(srsym.owner.symtabletype in [objectsymtable,recordsymtable]) or
is_visible_for_object(srsym,contextstructdef) and is_visible_for_object(srsym,contextstructdef) then
(not (ssf_search_option in flags) or (option in srsym.symoptions)) then
begin begin
{ we need to know if a procedure references symbols { we need to know if a procedure references symbols
in the static symtable, because then it can't be in the static symtable, because then it can't be
@ -2444,7 +2452,11 @@ implementation
begin begin
srsym:=tsym(srsymtable.FindWithHash(hashedid)); srsym:=tsym(srsymtable.FindWithHash(hashedid));
if assigned(srsym) and if assigned(srsym) and
(not(srsym.typ in [unitsym,namespacesym]) or srsymtable.iscurrentunit) and (
not(srsym.typ in [unitsym,namespacesym]) or
srsymtable.iscurrentunit or
(assigned(current_specializedef)and(current_specializedef.genericdef.owner.moduleid=srsymtable.moduleid))
) and
not(srsym.typ in [fieldvarsym,paravarsym,propertysym,procsym,labelsym]) and not(srsym.typ in [fieldvarsym,paravarsym,propertysym,procsym,labelsym]) and
(not (srsym.owner.symtabletype in [objectsymtable,recordsymtable]) or is_visible_for_object(srsym,current_structdef)) then (not (srsym.owner.symtabletype in [objectsymtable,recordsymtable]) or is_visible_for_object(srsym,current_structdef)) then
begin begin