Fixed HID Device Class Driver not allocating a temporary buffer when the host requests a report via the control endpoint and the user has set the PrevReportINBuffer driver configuration element to NULL (thanks to Lars Noschinski).

Clean up incomplete BluetoothHost debugging commands to use GCC extension to avoid NULL parameters when no formatting is required.

1 files changed, 7 insertions, 3 deletions

diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HID.c
index cc1ad43b5..7ff32498b 100644
--- a/LUFA/Drivers/USB/Class/Device/HID.c
+++ b/LUFA/Drivers/USB/Class/Device/HID.c
@@ -53,11 +53,15 @@ void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInter
 				uint16_t ReportINSize = 0;

 				uint8_t  ReportID     = (USB_ControlRequest.wValue & 0xFF);

 				uint8_t  ReportType   = (USB_ControlRequest.wValue >> 8) - 1;

+				uint8_t  ReportINData[HIDInterfaceInfo->Config.PrevReportINBufferSize];

+

+				memset(ReportINData, 0, sizeof(ReportINData));

 

-				memset(HIDInterfaceInfo->Config.PrevReportINBuffer, 0, HIDInterfaceInfo->Config.PrevReportINBufferSize);

-				

 				CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, ReportType,

 				                                    HIDInterfaceInfo->Config.PrevReportINBuffer, &ReportINSize);

+				

+				if (HIDInterfaceInfo->Config.PrevReportINBuffer != NULL)

+				  memcpy(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINData, HIDInterfaceInfo->Config.PrevReportINBufferSize);

 

 				Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);

 				Endpoint_Write_Control_Stream_LE(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINSize);

@@ -169,7 +173,7 @@ void HID_Device_USBTask(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)
 		if (HIDInterfaceInfo->Config.PrevReportINBuffer != NULL)

 		{

 			StatesChanged = (memcmp(ReportINData, HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINSize) != 0);

-			memcpy(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINData, ReportINSize);

+			memcpy(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINData, HIDInterfaceInfo->Config.PrevReportINBufferSize);

 		}

 

 		if (ReportINSize && (ForceSend || StatesChanged || IdlePeriodElapsed))