opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #1111: Add two safety checks in TAppSettings.GetSessionNames, trying to blindly fix some endless recursion happening on user nami0309's system when starting HeidiSQL

Browse Source
This commit is contained in:
Ansgar Becker
2020-08-03 12:07:41 +02:00
parent f2f7bdaf5f
commit 1529b32a2d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/apphelpers.pas
View File

@@ -4116,10 +4116,15 @@ begin
Result := TStringList.Create;
FRegistry.GetKeyNames(Result);
for i:=Result.Count-1 downto 0 do begin
FRegistry.OpenKey(CurPath+'\'+Result[i], False);
if FRegistry.ValueExists(GetValueName(asSessionFolder)) then begin
Folders.Add(Result[i]);
Result.Delete(i);
// Issue #1111 describes a recursive endless loop, which may be caused by an empty key name here?
if Result[i].IsEmpty then
Continue;
// ... may also be caused by some non accessible key. Check result of .OpenKey before looking for "Folder" value:
if FRegistry.OpenKey(CurPath+'\'+Result[i], False) then begin
if FRegistry.ValueExists(GetValueName(asSessionFolder)) then begin
Folders.Add(Result[i]);
Result.Delete(i);
end;
end;
end;
end;