paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 13:38:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from Iluha Companets to avoid crash when registry XML file is empty. Fixes issue #40912

Browse Source
This commit is contained in:
Michaël Van Canneyt 2024-09-04 14:34:01 +02:00
parent 28aaa672a1
commit cd13d5bb3a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/fcl-registry/src/xmlreg.pp
View File

@ -603,9 +603,13 @@ begin
FDocument.Free;
FDocument:=Nil;
end;
ReadXMLFile(FDocument,S);
if (FDocument=Nil) then
try
ReadXMLFile(FDocument,S);
if (FDocument=Nil) then
CreateEmptyDoc;
except
CreateEmptyDoc;
end;
SetRootKey('HKEY_CURRENT_USER');
FDirty:=False;
end;

4
packages/fcl-registry/src/xregreg.inc
View File

@ -190,8 +190,10 @@ procedure TRegistry.SysRegFree;
begin
if Assigned(FSysData) then
begin
TXMLRegistry(FSysData).Flush;
TXMLRegistryInstance.FreeXMLRegistry(TXMLRegistry(FSysData));
TXMLRegistryInstance.FreeXMLRegistry(TXMLRegistry(FSysData));
end;
end;
function TRegistry.SysCreateKey(Key: UnicodeString): Boolean;