EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: Fixed the USB string descriptor internal type appearing and being defined for C++ code, the unsized array member is UB in C++

Browse Source
This commit is contained in:
dragonmux
2024-04-15 11:57:26 +01:00
committed by Piotr Esden-Tempski
parent c31a239ae3
commit ee418f1780
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/libopencm3/usb/usbstd.h
View File

@@ -249,11 +249,13 @@ struct usb_endpoint_descriptor {
/* Table 9-15 specifies String Descriptor Zero. /* Table 9-15 specifies String Descriptor Zero.
* Table 9-16 specified UNICODE String Descriptor. * Table 9-16 specified UNICODE String Descriptor.
*/ */
#ifndef __cplusplus
struct usb_string_descriptor { struct usb_string_descriptor {
uint8_t bLength; uint8_t bLength;
uint8_t bDescriptorType; uint8_t bDescriptorType;
uint16_t wData[]; uint16_t wData[];
} __attribute__((packed)); } __attribute__((packed));
#endif
/* From ECN: Interface Association Descriptors, Table 9-Z */ /* From ECN: Interface Association Descriptors, Table 9-Z */
struct usb_iface_assoc_descriptor { struct usb_iface_assoc_descriptor {
@@ -275,4 +277,3 @@ enum usb_language_id {
#endif #endif
/**@}*/ /**@}*/