paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-03 13:18:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Removed several mem-leaks

Browse Source 
git-svn-id: trunk@18902 -
This commit is contained in:
joost 2011-08-29 14:44:09 +00:00
parent 0fc9930789
commit c0fa7e930b
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/fppkg/src/fpxmlrep.pp
View File

@ -736,9 +736,8 @@ procedure TFPXMLRepositoryHandler.LoadFromXml(D: TFPDependency; Stream: TStream)
Var Var
XML : TXMLDocument; XML : TXMLDocument;
begin begin
XML:=TXMLDocument.Create; Xmlread.ReadXMLFile(XML,Stream);
try try
Xmlread.ReadXMLFile(XML,Stream);
XmlToDependency(XML.DocumentElement,D); XmlToDependency(XML.DocumentElement,D);
finally finally
XML.Free; XML.Free;
@ -750,9 +749,8 @@ procedure TFPXMLRepositoryHandler.LoadFromXml(DS: TFPDependencies; Stream: TStre
Var Var
XML : TXMLDocument; XML : TXMLDocument;
begin begin
XML:=TXMLDocument.Create; xmlread.ReadXMLFile(XML,Stream);
try try
xmlread.ReadXMLFile(XML,Stream);
XmlToDependencies(XML.DocumentElement,DS); XmlToDependencies(XML.DocumentElement,DS);
finally finally
XML.Free; XML.Free;
@ -764,9 +762,8 @@ procedure TFPXMLRepositoryHandler.LoadFromXml(P: TFPPackage; Stream: TStream);
Var Var
XML : TXMLDocument; XML : TXMLDocument;
begin begin
XML:=TXMLDocument.Create; xmlread.ReadXMLFile(XML,Stream);
try try
xmlread.ReadXMLFile(XML,Stream);
XmlToPackage(XML.DocumentElement,P); XmlToPackage(XML.DocumentElement,P);
finally finally
XML.Free; XML.Free;
@ -778,9 +775,8 @@ procedure TFPXMLRepositoryHandler.LoadFromXml(PS: TFPPackages; Stream: TStream);
Var Var
XML : TXMLDocument; XML : TXMLDocument;
begin begin
XML:=TXMLDocument.Create; xmlread.ReadXMLFile(XML,Stream);
try try
xmlread.ReadXMLFile(XML,Stream);
XmlToPackages(XML.DocumentElement,PS); XmlToPackages(XML.DocumentElement,PS);
finally finally
XML.Free; XML.Free;
@ -792,9 +788,8 @@ procedure TFPXMLRepositoryHandler.LoadFromXml(R: TFPRepository; Stream: TStream)
Var Var
XML : TXMLDocument; XML : TXMLDocument;
begin begin
XML:=TXMLDocument.Create; xmlread.ReadXMLFile(XML,Stream);
try try
xmlread.ReadXMLFile(XML,Stream);
XmlToRepository(XML.DocumentElement,R); XmlToRepository(XML.DocumentElement,R);
finally finally
XML.Free; XML.Free;
@ -923,9 +918,8 @@ procedure TFPXMLMirrorHandler.LoadFromXml(PS: TFPMirrors; Stream: TStream);
Var Var
XML : TXMLDocument; XML : TXMLDocument;
begin begin
XML:=TXMLDocument.Create; xmlread.ReadXMLFile(XML,Stream);
try try
xmlread.ReadXMLFile(XML,Stream);
XmlToMirrors(XML.DocumentElement,PS); XmlToMirrors(XML.DocumentElement,PS);
finally finally
XML.Free; XML.Free;

25
packages/fppkg/src/pkgrepos.pp
View File

@ -261,6 +261,7 @@ procedure FindInstalledPackages(ACompilerOptions:TCompilerOptions;showdups:boole
end; end;
until FindNext(SR)<>0; until FindNext(SR)<>0;
end; end;
FindClose(SR);
end; end;
begin begin
@ -386,12 +387,16 @@ begin
else else
AvailVerStr:='<not available>'; AvailVerStr:='<not available>';
ReqVer:=TFPVersion.Create; ReqVer:=TFPVersion.Create;
ReqVer.AsString:=FPMKUnitDeps[i].ReqVer; try
log(vlDebug,SLogFPMKUnitDepVersion,[P.Name,ReqVer.AsString,P.Version.AsString,AvailVerStr]); ReqVer.AsString:=FPMKUnitDeps[i].ReqVer;
if ReqVer.CompareVersion(P.Version)<=0 then log(vlDebug,SLogFPMKUnitDepVersion,[P.Name,ReqVer.AsString,P.Version.AsString,AvailVerStr]);
FPMKUnitDeps[i].available:=true if ReqVer.CompareVersion(P.Version)<=0 then
else FPMKUnitDeps[i].available:=true
log(vlDebug,SLogFPMKUnitDepTooOld,[FPMKUnitDeps[i].package]); else
log(vlDebug,SLogFPMKUnitDepTooOld,[FPMKUnitDeps[i].package]);
finally
ReqVer.Free;
end;
end end
else else
log(vlDebug,SLogFPMKUnitDepTooOld,[FPMKUnitDeps[i].package]); log(vlDebug,SLogFPMKUnitDepTooOld,[FPMKUnitDeps[i].package]);
@ -662,4 +667,12 @@ begin
end; end;
end; end;
initialization
AvailableRepository := nil;
InstalledRepository := nil;
AvailableMirrors := nil;
finalization
AvailableRepository.Free;
InstalledRepository.Free;
AvailableMirrors.Free;
end. end.