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

Silence two crashes in QuotedDatabase and IsSameAs. See https://www.heidisql.com/forum.php?t=39040

Browse Source
This commit is contained in:
Ansgar Becker
2022-03-27 14:40:07 +02:00
parent 9a9b111c41
commit 3d90ce24d1
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/dbconnection.pas
View File

@@ -9895,13 +9895,19 @@ begin
if (not Assigned(CompareTo)) or (CompareTo = nil) then begin
Result := False;
end else begin
Result := FConnection.IdentifierEquals(Name, CompareTo.Name)
and (NodeType = CompareTo.NodeType)
and (Database = CompareTo.Database)
and (Schema = CompareTo.Schema)
and (Column = CompareTo.Column)
and (ArgTypes = CompareTo.ArgTypes)
and (Connection = CompareTo.Connection);
try
Result := FConnection.IdentifierEquals(Name, CompareTo.Name)
and (NodeType = CompareTo.NodeType)
and (Database = CompareTo.Database)
and (Schema = CompareTo.Schema)
and (Column = CompareTo.Column)
and (ArgTypes = CompareTo.ArgTypes)
and (Connection = CompareTo.Connection);
except
// No reproduction recipe yet, but numerous crashes from above were reported
on E:EAccessViolation do
Result := False;
end;
end;
end;

16
source/main.pas
View File

@@ -10697,11 +10697,17 @@ begin
and (DataGridTable <> nil)
and Assigned(DataGridTable)
then begin
KeyName := DataGridTable.QuotedDatabase+'.'+DataGridTable.QuotedName;
FocusedCol := '';
if DataGrid.FocusedColumn > NoColumn then
FocusedCol := DataGrid.Header.Columns[DataGrid.FocusedColumn].Text;
DataGridFocusedCell.Values[KeyName] := IntToStr(DataGrid.FocusedNode.Index) + DELIM + FocusedCol;
try
KeyName := DataGridTable.QuotedDatabase+'.'+DataGridTable.QuotedName;
FocusedCol := '';
if DataGrid.FocusedColumn > NoColumn then
FocusedCol := DataGrid.Header.Columns[DataGrid.FocusedColumn].Text;
DataGridFocusedCell.Values[KeyName] := IntToStr(DataGrid.FocusedNode.Index) + DELIM + FocusedCol;
except
on E:EAccessViolation do begin
LogSQL('HandleDataGridAttributes: '+E.Message, lcError);
end;
end;
end;
DataGridFocusedNodeIndex := 0;
DataGridFocusedColumnName := '';