fix: various crash causes, reported in uploaded bug reports

ansgarbecker · ansgarbecker · commit 6215d19ff59c · 2026-03-06T10:52:15.000+01:00
diff --git a/source/apphelpers.pas b/source/apphelpers.pas
@@ -3525,8 +3525,7 @@ procedure TWinControlHelper.TrySetFocus;
       and CanFocus then
       SetFocus;
   except
-    on E:EInvalidOperation do
-      SysUtils.Beep;
+    SysUtils.Beep;
   end;
 end;
 
diff --git a/source/const.inc b/source/const.inc
@@ -99,7 +99,7 @@ const
   MsgUnhandledNetType: String = 'Unhandled connection type (%d)';
   MsgUnhandledControl: String = 'Unhandled control in %s';
   MsgDisconnect: String = 'Connection to %s closed at %s';
-  MsgInvalidColumn: String = 'Column #%d not available. Query returned %d columns and %d rows.';
+  TextInvalidColumn: String = '?';
   FILEFILTER_SQLITEDB = '*.sqlite3;*.sqlite;*.db;*.s3db';
   FILEEXT_SQLITEDB = 'sqlite3';
   PROPOSAL_ITEM_HEIGHT = 18;
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
@@ -8797,8 +8797,9 @@ function TMySQLQuery.Col(Column: Integer; IgnoreErrors: Boolean=False): String;
       end;
 
     end;
-  end else if not IgnoreErrors then
-    Raise EDbError.CreateFmt(_(MsgInvalidColumn), [Column, ColumnCount, RecordCount]);
+  end
+  else
+    Result := TextInvalidColumn;
 end;
 
 {$IFDEF HASMSSQL}
@@ -8827,8 +8828,9 @@ function TSqlSrvQuery.Col(Column: Integer; IgnoreErrors: Boolean=False): String;
       else
         Result := '0';
     end
-  end else if not IgnoreErrors then
-    Raise EDbError.CreateFmt(_(MsgInvalidColumn), [Column, ColumnCount, RecordCount]);
+  end
+  else
+    Result := TextInvalidColumn;
 end;
 {$ENDIF}
 
@@ -8849,8 +8851,9 @@ function TPGQuery.Col(Column: Integer; IgnoreErrors: Boolean=False): String;
       else
         Result := Connection.DecodeAPIString(AnsiStr);
     end;
-  end else if not IgnoreErrors then
-    Raise EDbError.CreateFmt(_(MsgInvalidColumn), [Column, ColumnCount, RecordCount]);
+  end
+  else
+    Result := TextInvalidColumn;
 end;
 
 
@@ -8863,8 +8866,9 @@ function TSQLiteQuery.Col(Column: Integer; IgnoreErrors: Boolean=False): String;
     end else begin
       Result := FCurrentResults[FRecNoLocal][Column].OldText;
     end;
-  end else if not IgnoreErrors then
-    Raise EDbError.CreateFmt(_(MsgInvalidColumn), [Column, ColumnCount, RecordCount]);
+  end
+  else
+    Result := TextInvalidColumn;
 end;
 
 
@@ -8876,8 +8880,9 @@ function TSQLiteQuery.Col(Column: Integer; IgnoreErrors: Boolean=False): String;
     end else begin
       Result := FCurrentResults.Fields[Column].AsString;
     end;
-  end else if not IgnoreErrors then
-    Raise EDbError.CreateFmt(_(MsgInvalidColumn), [Column, ColumnCount, RecordCount]);
+  end
+  else
+    Result := TextInvalidColumn;
 end;}
 
 
@@ -8887,12 +8892,11 @@ function TDBQuery.Col(ColumnName: String; IgnoreErrors: Boolean=False): String;
 begin
   // ColumnNames is case insensitive, so we can select wrong cased columns in MariaDB 10.4
   // See #599
-  Result := '';
   idx := ColumnNames.IndexOf(ColumnName);
   if idx > -1 then
     Result := Col(idx)
-  else if not IgnoreErrors then
-    Raise EDbError.CreateFmt(_('Column "%s" not available.'), [ColumnName]);
+  else
+    Result := TextInvalidColumn;
 end;
 
 
@@ -8982,8 +8986,9 @@ function TDBQuery.ColAttributes(Column: Integer): TTableColumn;
   i: Integer;
 begin
   Result := nil;
-  if (Column < 0) or (Column >= FColumnOrgNames.Count) then
-    raise EDbError.CreateFmt(_('Column #%s not available.'), [IntToStr(Column)]);
+  if (Column < 0) or (Column >= FColumnOrgNames.Count) then begin
+    // Just return nil
+  end;
   if FColumns <> nil then begin
     for i:=0 to FColumns.Count-1 do begin
       if FColumns[i].Name = FColumnOrgNames[Column] then begin
diff --git a/source/main.pas b/source/main.pas
@@ -1519,8 +1519,10 @@ procedure TMainForm.StatusBarDrawPanel(StatusBar: TStatusBar; Panel: TStatusPane
     2: ImageIndex := 149;
     3: begin
       Conn := ActiveConnection;
-      if Conn <> nil then
+      if Conn <> nil then try
         ImageIndex := Conn.Parameters.ImageIndex;
+      except
+      end;
     end;
     5: ImageIndex := 190;
     6: begin
@@ -4238,7 +4240,7 @@ procedure TMainForm.SessionConnect(Sender: TObject);
   for i:=High(FTreeClickHistory) downto Low(FTreeClickHistory) do begin
     if FTreeClickHistory[i] <> nil then begin
       DBObj := DBtree.GetNodeData(FTreeClickHistory[i]);
-      if DBObj = nil then // Session disconnected
+      if (DBObj = nil) or (DBObj.Connection = nil) or (not DBObj.Connection.Active) then // Session disconnected
         Break;
       if DBObj.Connection.Parameters.SessionPath = SessionPath then begin
         Node := FTreeClickHistory[i];
@@ -9474,6 +9476,8 @@ procedure TMainForm.DBtreeGetImageIndex(Sender: TBaseVirtualTree; Node:
   if Column > 0 then
     Exit;
   DBObj := Sender.GetNodeData(Node);
+  if not Assigned(DBObj) then
+    Exit;
   case Kind of
     ikNormal, ikSelected:
       ImageIndex := DBObj.ImageIndex;
