From 9375fa8a703ec9f445cb40137e27a28951678062 Mon Sep 17 00:00:00 2001 From: deroschr Date: Wed, 12 Aug 2026 12:40:29 +0200 Subject: [PATCH 1/2] fix: address codeql warning alerts #20 Tidy the current warning-level CodeQL findings that were safe to address. - Remove an unused label in OrtsVerViewModel. - Reformat a ternary in the OleDb statement renderer. - Keep the alert remediation stream tied to issue #20. --- GenFreeWin/GenDBImplOLEDB/Data.DB/OleDbStatementRenderer.cs | 4 ++-- .../GenFreeWin/Gen_FreeWin/ViewModels/OrtsVerViewModel.cs | 1 - .../GenFreeWin/Gen_FreeWin/ViewModels/RahmenViewModel.cs | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/GenFreeWin/GenDBImplOLEDB/Data.DB/OleDbStatementRenderer.cs b/GenFreeWin/GenDBImplOLEDB/Data.DB/OleDbStatementRenderer.cs index 37dee9843..cc9130a65 100644 --- a/GenFreeWin/GenDBImplOLEDB/Data.DB/OleDbStatementRenderer.cs +++ b/GenFreeWin/GenDBImplOLEDB/Data.DB/OleDbStatementRenderer.cs @@ -63,8 +63,8 @@ public IDbCommand CreateQuery(string sTable, IEnumerable arrFields, IEnu public IDbCommand CreateQuery(IDbConnection dbConnection, string sTable, IEnumerable? arrFields = null, IEnumerable? arrFilters = null, int? iLimit = null, object? offset = null) { var sFields = (arrFields?.Count() ?? 0) == 0 - ? "*" - : string.Join(",", arrFields.Select(QuoteIdentifier)); + ? "*" + : string.Join(",", arrFields.Select(QuoteIdentifier)); var xBuilder = new StringBuilder($"SELECT {sFields} FROM {QuoteIdentifier(sTable)}"); AppendFilters(xBuilder, arrFilters); diff --git a/GenFreeWin/GenFreeWin/Gen_FreeWin/ViewModels/OrtsVerViewModel.cs b/GenFreeWin/GenFreeWin/Gen_FreeWin/ViewModels/OrtsVerViewModel.cs index e04655935..0788ab477 100644 --- a/GenFreeWin/GenFreeWin/Gen_FreeWin/ViewModels/OrtsVerViewModel.cs +++ b/GenFreeWin/GenFreeWin/Gen_FreeWin/ViewModels/OrtsVerViewModel.cs @@ -2106,7 +2106,6 @@ public void ListBox4_DoubleClick(object sender, EventArgs e) // break; //} end_IL_0001_3: - ; } [RelayCommand] public void OpenDistancePanel() diff --git a/GenFreeWin/GenFreeWin/Gen_FreeWin/ViewModels/RahmenViewModel.cs b/GenFreeWin/GenFreeWin/Gen_FreeWin/ViewModels/RahmenViewModel.cs index 1c7573533..55cee7507 100644 --- a/GenFreeWin/GenFreeWin/Gen_FreeWin/ViewModels/RahmenViewModel.cs +++ b/GenFreeWin/GenFreeWin/Gen_FreeWin/ViewModels/RahmenViewModel.cs @@ -331,8 +331,7 @@ public void btnDelete_Click(object eventSender, EventArgs eventArgs) { _ = DataModul.Link.Delete(Modul1.FamInArb, Modul1.PersInArb, Modul1.eLKennz); View.Close(); - short Rich; - Familie.Default.Fameinlesen(Modul1.FamInArb, out Rich); + Familie.Default.Fameinlesen(Modul1.FamInArb, out short rich); } } } From 8e887bc0022a51af0ac994d478deaaefc9e076ea Mon Sep 17 00:00:00 2001 From: Christian Rosewich Date: Wed, 12 Aug 2026 13:44:10 +0200 Subject: [PATCH 2/2] Potential fix for code scanning alert no. 9509: Invalid string formatting Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> --- CSharpBible/SomeThing/Statistic4/Program.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CSharpBible/SomeThing/Statistic4/Program.cs b/CSharpBible/SomeThing/Statistic4/Program.cs index 617e047a5..c1b86cae9 100644 --- a/CSharpBible/SomeThing/Statistic4/Program.cs +++ b/CSharpBible/SomeThing/Statistic4/Program.cs @@ -131,8 +131,11 @@ void Run(int[] prog) if (arg < 0 || arg >= templates.Length) throw new IndexOutOfRangeException($"Template index {arg} out of range."); string tmpl = templates[arg]; - Console.WriteLine(string.Format(CultureInfo.InvariantCulture, tmpl, lastObj)); - System.Diagnostics.Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, tmpl, lastObj)); + string formatted = tmpl.Contains("{", StringComparison.Ordinal) + ? string.Format(CultureInfo.InvariantCulture, tmpl, lastObj) + : tmpl; + Console.WriteLine(formatted); + System.Diagnostics.Debug.WriteLine(formatted); } else {