Add range check to keyboard backlight commands

Sparronator9999 · Dec 4, 2024 · cf6dba2 · cf6dba2
1 parent 9348b22
commit cf6dba2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/YAMDCC.GUI/MainWindow.cs b/YAMDCC.GUI/MainWindow.cs
@@ -298,6 +298,14 @@ private void IPC_MessageReceived(object sender, PipeMessageEventArgs<ServiceResp
                     {
                         if (int.TryParse(args[0], out int value))
                         {
+                            // value received from service should be valid,
+                            // but let's check anyway to avoid potential crashes
+                            // from non-official YAMDCC services
+                            if (value < 0 || value > Config.KeyLightConf.MaxVal - Config.KeyLightConf.MinVal)
+                            {
+                                break;
+                            }
+
                             tbKeyLight.Invoke(new Action(delegate
                             {
                                 tbKeyLight.Maximum = Config.KeyLightConf.MaxVal - Config.KeyLightConf.MinVal;

diff --git a/YAMDCC.Service/FanControlService.cs b/YAMDCC.Service/FanControlService.cs
@@ -695,7 +695,10 @@ private int GetKeyLightBright(int clientId)
             if (success)
             {
                 int brightness = value - Config.KeyLightConf.MinVal;
-                response = new(Response.KeyLightBright, $"{brightness}");
+
+                response = value < Config.KeyLightConf.MinVal || value > Config.KeyLightConf.MaxVal
+                    ? new(Response.Error, $"{(int)Command.GetKeyLightBright}")
+                    : new(Response.KeyLightBright, $"{brightness}");
             }
             else
             {