laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Merge pull request #131 from lucianomartin/develop

Browse Source 
Fix wrong size of vendor and product strings and add debug printouts
This commit is contained in:
Luciano Martin
2020-04-17 16:33:30 +01:00
committed by GitHub
parent f3ab9a8532 a89371c143
commit c260039d0b
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.rst
View File

@@ -1,6 +1,11 @@
lib_xua Change Log lib_xua Change Log
================== ==================
1.0.1
-----
* FIXED: Wrong size of vendor and product strings
1.0.0 1.0.0
----- -----

2
lib_xua/module_build_info
View File

@@ -1,4 +1,4 @@
VERSION = 1.0.0 VERSION = 1.0.1
DEPENDENT_MODULES = lib_logging(>=3.0.0) \ DEPENDENT_MODULES = lib_logging(>=3.0.0) \
lib_xassert(>=4.0.0) \ lib_xassert(>=4.0.0) \

10
lib_xua/src/core/endpoint0/xua_endpoint0.c
View File

@@ -234,6 +234,8 @@ void XUA_Endpoint0_setVendorId(unsigned short vid) {
} }
void concatenateAndCopyStrings(char* string1, char* string2, char* string_buffer) { void concatenateAndCopyStrings(char* string1, char* string2, char* string_buffer) {
debug_printf("concatenateAndCopyStrings() for \"%s\" and \"%s\"\n", string1, string2);
memset(string_buffer, '\0', strlen(string_buffer)); memset(string_buffer, '\0', strlen(string_buffer));
uint32_t remaining_buffer_size = MIN(strlen(string1), XUA_MAX_STR_LEN-1); uint32_t remaining_buffer_size = MIN(strlen(string1), XUA_MAX_STR_LEN-1);
@@ -242,9 +244,11 @@ void concatenateAndCopyStrings(char* string1, char* string2, char* string_buffer
if (total_string_size==XUA_MAX_STR_LEN-1) { if (total_string_size==XUA_MAX_STR_LEN-1) {
remaining_buffer_size = XUA_MAX_STR_LEN-1-strlen(string1); remaining_buffer_size = XUA_MAX_STR_LEN-1-strlen(string1);
} else { } else {
remaining_buffer_size = strlen(string1); remaining_buffer_size = strlen(string2);
} }
strncat(string_buffer, string2, remaining_buffer_size); strncat(string_buffer, string2, remaining_buffer_size);
debug_printf("concatenateAndCopyStrings() creates \"%s\"\n", string_buffer);
} }
void XUA_Endpoint0_setStrTable() { void XUA_Endpoint0_setStrTable() {
@@ -288,12 +292,12 @@ void XUA_Endpoint0_setStrTable() {
} }
void XUA_Endpoint0_setVendorStr(char* vendor_str) { void XUA_Endpoint0_setVendorStr(char* vendor_str) {
debug_printf("XUA_Endpoint0_setVendorStr() with string %s", vendor_str); debug_printf("XUA_Endpoint0_setVendorStr() with string %s\n", vendor_str);
concatenateAndCopyStrings(vendor_str, "", g_vendor_str); concatenateAndCopyStrings(vendor_str, "", g_vendor_str);
} }
void XUA_Endpoint0_setProductStr(char* product_str) { void XUA_Endpoint0_setProductStr(char* product_str) {
debug_printf("XUA_Endpoint0_setProductStr() with string %s", product_str); debug_printf("XUA_Endpoint0_setProductStr() with string %s\n", product_str);
concatenateAndCopyStrings(product_str, "", g_product_str); concatenateAndCopyStrings(product_str, "", g_product_str);
} }