From daebd69bc21f5cf8468488e53a2241467c4be398 Mon Sep 17 00:00:00 2001
From: Firewolf1337 <18141890+Firewolf1337@users.noreply.github.com>
Date: Thu, 11 Jul 2024 13:14:46 +0200
Subject: [PATCH] Fixed CVE-2024-30105 Fixed overlapping menus

---
 RCRCustomSeries/RCRCustomSeries.csproj |  2 +-
 RCRPlanner/App.config                  |  4 ++++
 RCRPlanner/MainWindow.xaml             | 13 ++++++++-----
 RCRPlanner/MainWindow.xaml.cs          | 17 ++++++++++++-----
 RCRPlanner/RCRPlanner.csproj           |  4 ++--
 RCRPlanner/packages.config             |  2 +-
 6 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/RCRCustomSeries/RCRCustomSeries.csproj b/RCRCustomSeries/RCRCustomSeries.csproj
index 0f80cec..8b25518 100644
--- a/RCRCustomSeries/RCRCustomSeries.csproj
+++ b/RCRCustomSeries/RCRCustomSeries.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="8.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/RCRPlanner/App.config b/RCRPlanner/App.config
index 1bac218..113ba4f 100644
--- a/RCRPlanner/App.config
+++ b/RCRPlanner/App.config
@@ -14,6 +14,10 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <userSettings>
diff --git a/RCRPlanner/MainWindow.xaml b/RCRPlanner/MainWindow.xaml
index b84274f..dfca668 100644
--- a/RCRPlanner/MainWindow.xaml
+++ b/RCRPlanner/MainWindow.xaml
@@ -60,11 +60,6 @@
                 <CheckBox x:Name="cbMenu3" Grid.Column="2" Grid.Row="0" Height="30" Click="cbMenu3_Click" />
                 <DockPanel x:Name="dpMenu3" Grid.Column="2" Grid.Row="0" Grid.ColumnSpan="2" Background="Transparent" Width="Auto" HorizontalAlignment="Left">
                     <Label x:Name="lbMenu3"  Style="{StaticResource DefaultLabelStyle}"/>
-                    <DockPanel x:Name="dpDPMenu3" Width="Auto" HorizontalAlignment="Left">
-                        <DatePicker Template="{DynamicResource DatePickerTemplate1}" x:Name="dpMenu3date" VerticalAlignment="Center" Text="Date" BorderThickness="0" Style="{StaticResource DateTimeCalendar}" SelectedDateFormat="Short" SelectedDateChanged="dpMenu3date_SelectedDateChanged"/>
-                        <Button x:Name="btnDateLower" Content="⯇" Click="btnDateLower_Click"/>
-                        <Button x:Name="btnDateHigher" Content="⯈" Click="btnDateHigher_Click"/>
-                    </DockPanel>
                     <ComboBox x:Name="ddMenu3" Height="25" Width="100" SelectionChanged="ddMenu3_SelectionChanged">
                         <ComboBox.ItemsPanel>
                             <ItemsPanelTemplate>
@@ -73,6 +68,14 @@
                         </ComboBox.ItemsPanel>
                     </ComboBox>
                 </DockPanel>
+                <DockPanel x:Name="dpMenu3Date" Grid.Column="2" Grid.Row="0" Grid.ColumnSpan="2" Background="Transparent" Width="Auto" HorizontalAlignment="Left">
+                    <Label x:Name="lbMenu3Date"  Style="{StaticResource DefaultLabelStyle}"/>
+                    <DockPanel x:Name="dpDPMenu3" Width="Auto" HorizontalAlignment="Left">
+                        <DatePicker Template="{DynamicResource DatePickerTemplate1}" x:Name="dpMenu3date" VerticalAlignment="Center" Text="Date" BorderThickness="0" Style="{StaticResource DateTimeCalendar}" SelectedDateFormat="Short" SelectedDateChanged="dpMenu3date_SelectedDateChanged"/>
+                        <Button x:Name="btnDateLower" Content="⯇" Click="btnDateLower_Click"/>
+                        <Button x:Name="btnDateHigher" Content="⯈" Click="btnDateHigher_Click"/>
+                    </DockPanel>
+                </DockPanel>
                 <CheckBox x:Name="cbMenu4" Grid.Column="3" Grid.Row="0" Height="30" Click="cbMenu4_Click"/>
                 <DockPanel x:Name="dpMenu4" Grid.Column="3" Grid.Row="0" Grid.ColumnSpan="2" Background="Transparent" Width="Auto" HorizontalAlignment="Left">
                     <Label x:Name="lbMenu4"  Style="{StaticResource DefaultLabelStyle}"/>
diff --git a/RCRPlanner/MainWindow.xaml.cs b/RCRPlanner/MainWindow.xaml.cs
index 69668f8..7077101 100644
--- a/RCRPlanner/MainWindow.xaml.cs
+++ b/RCRPlanner/MainWindow.xaml.cs
@@ -2406,6 +2406,7 @@ private void btnLoadCars_Click(object sender, RoutedEventArgs e)
             lbMenu2.Visibility = Visibility.Hidden;
             cbMenu3.Visibility = Visibility.Hidden;
             dpMenu3.Visibility = Visibility.Hidden;
+            dpMenu3Date.Visibility = Visibility.Hidden;
             cbMenu4.Visibility = Visibility.Visible;
             dpMenu4.Visibility = Visibility.Hidden;
             cbMenu5.Visibility = Visibility.Visible;
@@ -2442,6 +2443,7 @@ private void btnLoadTracks_Click(object sender, RoutedEventArgs e)
             lbMenu2.Visibility = Visibility.Hidden;
             cbMenu3.Visibility = Visibility.Hidden;
             dpMenu3.Visibility = Visibility.Hidden;
+            dpMenu3Date.Visibility = Visibility.Hidden;
             cbMenu4.Visibility = Visibility.Visible;
             dpMenu4.Visibility = Visibility.Hidden;
             cbMenu5.Visibility = Visibility.Visible;
@@ -2477,6 +2479,7 @@ private void btnLoadPurchase_Click(object sender, RoutedEventArgs e)
             lbMenu2.Visibility = Visibility.Hidden;
             cbMenu3.Visibility = Visibility.Hidden;
             dpMenu3.Visibility = Visibility.Hidden;
+            dpMenu3Date.Visibility = Visibility.Hidden;
             cbMenu4.Visibility = Visibility.Hidden;
             dpMenu4.Visibility = Visibility.Hidden;
             cbMenu5.Visibility = Visibility.Hidden;
@@ -2506,6 +2509,7 @@ private void btnLoadSeries_Click(object sender, RoutedEventArgs e)
             lbMenu2.Visibility = Visibility.Hidden;
             cbMenu3.Visibility = Visibility.Hidden;
             dpMenu3.Visibility = Visibility.Hidden;
+            dpMenu3Date.Visibility = Visibility.Hidden;
             cbMenu4.Visibility = Visibility.Visible;
             dpMenu4.Visibility = Visibility.Hidden;
             cbMenu5.Visibility = Visibility.Visible;
@@ -2540,8 +2544,8 @@ private void btnLoadRaces_Click(object sender, RoutedEventArgs e)
             dpMenu2.Visibility = Visibility.Visible;
             lbMenu2.Visibility = Visibility.Visible;
             cbMenu3.Visibility = Visibility.Hidden;
-            dpMenu3.Visibility = Visibility.Visible;
-            dpDPMenu3.Visibility = Visibility.Visible;
+            dpMenu3.Visibility = Visibility.Hidden;
+            dpMenu3Date.Visibility = Visibility.Visible;
             ddMenu3.Visibility = Visibility.Hidden;
             cbMenu4.Visibility = Visibility.Hidden;
             cbMenu5.Visibility = Visibility.Hidden;
@@ -2556,7 +2560,7 @@ private void btnLoadRaces_Click(object sender, RoutedEventArgs e)
             ddMenu2.ItemsSource = cbAlarms;
             ddMenu2.SelectedIndex = Properties.Settings.Default.defaultTimer;
             lbMenu2.Content = "Alarm offset:";
-            lbMenu3.Content = "Date:";
+            lbMenu3Date.Content = "Date:";
 
             stackPanelMenuClose_MouseDown(null, null);
 
@@ -2571,7 +2575,7 @@ private void btnPartStats_Click(object sender, RoutedEventArgs e)
             dpMenu2.Visibility = Visibility.Visible;
             lbMenu2.Visibility = Visibility.Visible;
             dpMenu3.Visibility = Visibility.Visible;
-            dpDPMenu3.Visibility = Visibility.Hidden;
+            dpMenu3Date.Visibility = Visibility.Hidden;
             ddMenu3.Visibility = Visibility.Visible;
             dpMenu4.Visibility = Visibility.Visible;
             dpMenu5.Visibility = Visibility.Visible;
@@ -2610,7 +2614,7 @@ private void btniRatingStats_Click(object sender, RoutedEventArgs e)
             dpMenu2.Visibility = Visibility.Visible;
             lbMenu2.Visibility = Visibility.Visible;
             dpMenu3.Visibility = Visibility.Visible;
-            dpDPMenu3.Visibility = Visibility.Hidden;
+            dpMenu3Date.Visibility = Visibility.Hidden;
             ddMenu3.Visibility = Visibility.Visible;
             dpMenu4.Visibility = Visibility.Visible;
             dpMenu5.Visibility = Visibility.Hidden;
@@ -2651,6 +2655,7 @@ private void btnLoadAutoStart_Click(object sender, RoutedEventArgs e)
             lbMenu2.Visibility = Visibility.Hidden;
             cbMenu3.Visibility = Visibility.Visible;
             dpMenu3.Visibility = Visibility.Hidden;
+            dpMenu3Date.Visibility = Visibility.Hidden;
             cbMenu4.Visibility = Visibility.Visible;
             dpMenu4.Visibility = Visibility.Hidden;
             cbMenu5.Visibility = Visibility.Visible;
@@ -2690,6 +2695,7 @@ private void btnLoadSeasonOverview_Click(object sender, RoutedEventArgs e)
             lbMenu2.Visibility = Visibility.Hidden;
             cbMenu3.Visibility = Visibility.Hidden;
             dpMenu3.Visibility = Visibility.Hidden;
+            dpMenu3Date.Visibility = Visibility.Hidden;
             cbMenu4.Visibility = Visibility.Hidden;
             cbMenu5.Visibility = Visibility.Hidden;
             dpMenu4.Visibility = Visibility.Hidden;
@@ -2716,6 +2722,7 @@ private void btnParnter_Click(object sender, RoutedEventArgs e)
             lbMenu2.Visibility = Visibility.Hidden;
             cbMenu3.Visibility = Visibility.Hidden;
             dpMenu3.Visibility = Visibility.Hidden;
+            dpMenu3Date.Visibility = Visibility.Hidden;
             cbMenu4.Visibility = Visibility.Hidden;
             cbMenu5.Visibility = Visibility.Hidden;
             dpMenu4.Visibility = Visibility.Hidden;
diff --git a/RCRPlanner/RCRPlanner.csproj b/RCRPlanner/RCRPlanner.csproj
index 9390696..a004471 100644
--- a/RCRPlanner/RCRPlanner.csproj
+++ b/RCRPlanner/RCRPlanner.csproj
@@ -116,8 +116,8 @@
     <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.8.0.0\lib\net462\System.Text.Json.dll</HintPath>
+    <Reference Include="System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
diff --git a/RCRPlanner/packages.config b/RCRPlanner/packages.config
index 53fb348..3b8e112 100644
--- a/RCRPlanner/packages.config
+++ b/RCRPlanner/packages.config
@@ -9,7 +9,7 @@
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="7.0.0-preview.2.22152.2" targetFramework="net472" />
   <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net472" />
-  <package id="System.Text.Json" version="8.0.0" targetFramework="net472" />
+  <package id="System.Text.Json" version="8.0.4" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
 </packages>
\ No newline at end of file