pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix memory leak in ODS reader.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8352 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2022-07-19 20:55:25 +00:00
parent beb0481d33
commit 2f844467a9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/fpspreadsheet/source/common/fpsopendocument.pas
View File

@ -2902,7 +2902,11 @@ begin
if UnzipToStream(AStream, 'meta.xml', XMLStream) then if UnzipToStream(AStream, 'meta.xml', XMLStream) then
begin begin
ReadXMLStream(Doc, XMLStream); ReadXMLStream(Doc, XMLStream);
ReadMetaData(Doc.DocumentElement.FindNode('office:meta')); try
ReadMetaData(Doc.DocumentElement.FindNode('office:meta'));
finally
FreeAndNil(Doc);
end;
end; end;
finally finally
XMLStream.Free; XMLStream.Free;
@ -2914,8 +2918,12 @@ begin
if UnzipToStream(AStream, 'settings.xml', XMLStream) then if UnzipToStream(AStream, 'settings.xml', XMLStream) then
begin begin
ReadXMLStream(Doc, XMLStream); ReadXMLStream(Doc, XMLStream);
OfficeSettingsNode := Doc.DocumentElement.FindNode('office:settings'); try
ReadSettings(OfficeSettingsNode); OfficeSettingsNode := Doc.DocumentElement.FindNode('office:settings');
ReadSettings(OfficeSettingsNode);
finally
FreeAndNil(Doc);
end;
end; end;
finally finally
XMLStream.Free; XMLStream.Free;