Fix mem leak in GetServiceDefaultAddress and GetServiceDefaultFormatProperties

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1165 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2010-02-24 16:34:06 +00:00
parent b4f2e0ec15
commit 4251a64fec

View File

@ -124,16 +124,22 @@ var
typData : PTypeData;
servcMdt : PService;
propData : PPropertyData;
mmm : IModuleMetadataMngr;
begin
Result := '';
if Assigned(AServiceTyp) and (AServiceTyp^.Kind = tkInterface) then begin
typData := GetTypeData(AServiceTyp);
if Assigned(typData) then begin
servcMdt := GetModuleMetadataMngr().GetServiceMetadata(typData^.IntfUnit,AServiceTyp^.Name);
if Assigned(AServiceTyp) then begin
mmm := GetModuleMetadataMngr();
servcMdt := mmm.GetServiceMetadata(typData^.IntfUnit,AServiceTyp^.Name);
if Assigned(servcMdt) then begin
try
propData := Find(servcMdt^.Properties,sTRANSPORT + '_' + sADDRESS);
if Assigned(propData) then
Result := propData^.Data;
finally
mmm.ClearServiceMetadata(servcMdt);
end;
end;
end;
end;
@ -145,13 +151,16 @@ var
servcMdt : PService;
propData : PPropertyData;
strName : string;
mmm : IModuleMetadataMngr;
begin
Result := '';
if Assigned(AServiceTyp) and (AServiceTyp^.Kind = tkInterface) then begin
typData := GetTypeData(AServiceTyp);
if Assigned(typData) then begin
servcMdt := GetModuleMetadataMngr().GetServiceMetadata(typData^.IntfUnit,AServiceTyp^.Name);
if Assigned(AServiceTyp) then begin
mmm := GetModuleMetadataMngr();
servcMdt := mmm.GetServiceMetadata(typData^.IntfUnit,AServiceTyp^.Name);
if Assigned(servcMdt) then begin
try
propData := servcMdt^.Properties;
while Assigned(propData) do begin
if ( AnsiPos(sFORMAT + '_',propData^.Name) = 1 ) then begin
@ -165,6 +174,9 @@ begin
if not IsStrEmpty(Result) then begin
Delete(Result,Length(Result),1);
end;
finally
mmm.ClearServiceMetadata(servcMdt);
end;
end;
end;
end;