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

IDE: Fixed possible AV's during the dependency checks on fpmake-packages

Browse Source 
git-svn-id: trunk@59710 -
This commit is contained in:
joost 2018-12-01 17:17:34 +00:00
parent 91faa27f7b
commit a8790dd007
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packager/packagesystem.pas
View File

@ -1520,7 +1520,7 @@ function TLazPackageGraph.FindDependencyRecursively(
Result:=CurDependency; Result:=CurDependency;
exit; exit;
end; end;
if CurDependency.LoadPackageResult=lprSuccess then begin if (CurDependency.DependencyType=pdtLazarus) and (CurDependency.LoadPackageResult=lprSuccess) then begin
RequiredPackage:=CurDependency.RequiredPackage; RequiredPackage:=CurDependency.RequiredPackage;
if (not (lpfVisited in RequiredPackage.Flags)) then begin if (not (lpfVisited in RequiredPackage.Flags)) then begin
RequiredPackage.Flags:=RequiredPackage.Flags+[lpfVisited]; RequiredPackage.Flags:=RequiredPackage.Flags+[lpfVisited];
@ -2580,14 +2580,14 @@ function TLazPackageGraph.FindPath(StartPackage: TLazPackage;
if SysUtils.CompareText(Dependency.PackageName,EndPackageName)=0 then begin if SysUtils.CompareText(Dependency.PackageName,EndPackageName)=0 then begin
// path found // path found
PathList:=TFPList.Create; PathList:=TFPList.Create;
if Dependency.LoadPackageResult=lprSuccess then begin if (Dependency.DependencyType=pdtLazarus) and (Dependency.LoadPackageResult=lprSuccess) then begin
PathList.Add(Dependency.RequiredPackage); PathList.Add(Dependency.RequiredPackage);
end else begin end else begin
PathList.Add(Dependency); PathList.Add(Dependency);
end; end;
exit; exit;
end; end;
if Dependency.LoadPackageResult=lprSuccess then begin if (Dependency.DependencyType=pdtLazarus) and (Dependency.LoadPackageResult=lprSuccess) then begin
// dependency ok // dependency ok
RequiredPackage:=Dependency.RequiredPackage; RequiredPackage:=Dependency.RequiredPackage;
if not (lpfVisited in RequiredPackage.Flags) then begin if not (lpfVisited in RequiredPackage.Flags) then begin