Skip to content

Commit 5f68c65

Browse files
authored
Merge pull request arduino#182 from kaysievers/tinyusb-descriptor-len
tinyusb: Correct descriptor string length calculation
2 parents 361481d + 7f3211f commit 5f68c65

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

cores/arduino/Adafruit_TinyUSB_Core/Adafruit_USBD_Device.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ static int strcpy_uni16(const char *s, uint16_t *buf, int bufsize) {
254254
int i = 0;
255255
int buflen = 0;
256256

257-
while (i < bufsize) {
257+
while (s[i] != 0 && i < bufsize) {
258258
int unichar;
259259
int utf8len = utf8_to_unichar(s + i, &unichar);
260260

@@ -271,7 +271,6 @@ static int strcpy_uni16(const char *s, uint16_t *buf, int bufsize) {
271271
buf[buflen++] = unichar;
272272
}
273273

274-
buf[buflen] = '\0';
275274
return buflen;
276275
}
277276

0 commit comments

Comments
 (0)