From 2dab17f5dc99b2d63e4b0dcb0211816c6648e63b Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 30 Jul 2026 19:14:21 -0500 Subject: [PATCH] Error out if setting RGBController description parsing fails in NetworkClient --- NetworkClient.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/NetworkClient.cpp b/NetworkClient.cpp index cb6885a2f..353ab110e 100644 --- a/NetworkClient.cpp +++ b/NetworkClient.cpp @@ -1993,7 +1993,11 @@ void NetworkClient::ProcessReply_ControllerData(unsigned int data_size, unsigned | Create a new controller from the received data | \*-------------------------------------------------*/ new_controller = new RGBController_Network(this, dev_id); - RGBController::SetDeviceDescription(data_ptr, data_size - (unsigned int)(data_ptr - data_start), new_controller, GetProtocolVersion()); + + if(RGBController::SetDeviceDescription(data_ptr, data_size - (unsigned int)(data_ptr - data_start), new_controller, GetProtocolVersion()) == NULL) + { + goto COPY_DATA_ERROR; + } /*-------------------------------------------------*\ | Mark this controller as remote owned | @@ -2290,7 +2294,10 @@ void NetworkClient::ProcessRequest_RGBController_SignalUpdate(unsigned int data_ | UpdateLEDs() sends color description | \*-------------------------------------------------*/ case RGBCONTROLLER_UPDATE_REASON_UPDATELEDS: - RGBController::SetColorDescription(data_ptr, data_size - (unsigned int)(data_ptr - data_start), controller, GetProtocolVersion()); + if(RGBController::SetColorDescription(data_ptr, data_size - (unsigned int)(data_ptr - data_start), controller, GetProtocolVersion()) == NULL) + { + goto COPY_DATA_ERROR; + } break; /*-------------------------------------------------*\ @@ -2307,7 +2314,10 @@ void NetworkClient::ProcessRequest_RGBController_SignalUpdate(unsigned int data_ case RGBCONTROLLER_UPDATE_REASON_SETDEVICESPECIFICCONFIGURATION: case RGBCONTROLLER_UPDATE_REASON_SETDEVICESPECIFICZONECONFIGURATION: default: - RGBController::SetDeviceDescription(data_ptr, data_size - (unsigned int)(data_ptr - data_start), controller, GetProtocolVersion()); + if(RGBController::SetDeviceDescription(data_ptr, data_size - (unsigned int)(data_ptr - data_start), controller, GetProtocolVersion()) == NULL) + { + goto COPY_DATA_ERROR; + } /*---------------------------------------------*\ | Mark this controller as remote owned |