mirror/tinyusb
3
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2026-03-30 03:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtp: fix adding empty cstring to mtp_container_info

Browse Source
This commit is contained in:
stepan chepushtanov
2026-03-05 13:43:37 +07:00
parent cd7bbba1dd
commit a64a8579c5
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/class/mtp/mtp.h
View File

@ -802,9 +802,19 @@ TU_ATTR_ALWAYS_INLINE static inline uint32_t mtp_container_add_string(mtp_contai
while (utf16[count] != 0u) {
count++;
}
count++;
uint8_t* buf = p_container->payload + p_container->header->len - sizeof(mtp_container_header_t);
if(count == 1){
// empty string (size only): single zero byte
TU_ASSERT(p_container->header->len + 1 < CFG_TUD_MTP_EP_BUFSIZE, 0);
*buf = 0;
p_container->header->len++;
return 1u;
}
const uint32_t added_len = 1u + (uint32_t) count * 2u;
TU_ASSERT(p_container->header->len + added_len < CFG_TUD_MTP_EP_BUFSIZE, 0);
uint8_t* buf = p_container->payload + p_container->header->len - sizeof(mtp_container_header_t);
*buf++ = count;
p_container->header->len++;
@ -817,26 +827,28 @@ TU_ATTR_ALWAYS_INLINE static inline uint32_t mtp_container_add_string(mtp_contai
TU_ATTR_ALWAYS_INLINE static inline uint32_t mtp_container_add_cstring(mtp_container_info_t* p_container, const char* str) {
const uint8_t len = (uint8_t) (strlen(str) + 1); // include null
TU_ASSERT(p_container->header->len + 1 + 2 * len < CFG_TUD_MTP_EP_BUFSIZE, 0);
uint8_t* buf = p_container->payload + p_container->header->len - sizeof(mtp_container_header_t);
if (len == 1) {
// empty string (null only): single zero byte
// empty string (size only): single zero byte
TU_ASSERT(p_container->header->len + 1 < CFG_TUD_MTP_EP_BUFSIZE, 0);
*buf = 0;
p_container->header->len++;
return 1u;
} else {
*buf++ = len;
p_container->header->len++;
for (uint8_t i = 0; i < len; i++) {
buf[0] = str[i];
buf[1] = 0;
buf += 2;
p_container->header->len += 2;
}
return 1u + 2u * len;
}
TU_ASSERT(p_container->header->len + 1 + 2 * len < CFG_TUD_MTP_EP_BUFSIZE, 0);
*buf++ = len;
p_container->header->len++;
for (uint8_t i = 0; i < len; i++) {
*buf++ = str[i];
*buf++ = 0;
}
p_container->header->len += 2u*len;
return 1u + 2u * len;
}
TU_ATTR_ALWAYS_INLINE static inline uint32_t mtp_container_add_uint8(mtp_container_info_t* p_container, uint8_t data) {

4
src/class/mtp/mtp_device.h
View File

@ -78,6 +78,10 @@ typedef struct {
mtp_auint16_t(_capture_count) capture_formats; \
mtp_auint16_t(_playback_count) playback_formats; \
/* string fields will be added using append function */ \
/* mtp_string_t() Manufacturer */ \
/* mtp_string_t() Model */ \
/* mtp_string_t() Device Version */ \
/* mtp_string_t() Serial Number */ \
}
typedef MTP_DEVICE_INFO_STRUCT( //-V2586 [MISRA-C-18.7] Flexible array members should not be declared