Fix for issue #83

abratchik · abratchik · commit d9b18f44ae2f · 2021-02-19T11:36:05.000+04:00
diff --git a/libraries/HID/src/HID.cpp b/libraries/HID/src/HID.cpp
@@ -83,10 +83,11 @@ int HID_::getDescriptor(USBSetup& setup)
 uint8_t HID_::getShortName(char *name)
 {
     if(serial) {
-        for(byte i=0; i<strlen_P(serial); i++) {
+        byte seriallen=min(strlen_P(serial), ISERIAL_MAX_LEN);
+        for(byte i=0; i< seriallen; i++) {
             name[i] = pgm_read_byte_near(serial + i);
         }
-        return strlen_P(serial);
+        return seriallen;
     }
     else {
         

Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,11 @@ int HID_::getDescriptor(USBSetup& setup)`
`83`	`83`	`uint8_t HID_::getShortName(char *name)`
`84`	`84`	`{`
`85`	`85`	`if(serial) {`
`86`		`- for(byte i=0; i<strlen_P(serial); i++) {`
	`86`	`+ byte seriallen=min(strlen_P(serial), ISERIAL_MAX_LEN);`
	`87`	`+ for(byte i=0; i< seriallen; i++) {`
`87`	`88`	`name[i] = pgm_read_byte_near(serial + i);`
`88`	`89`	`}`
`89`		`- return strlen_P(serial);`
	`90`	`+ return seriallen;`
`90`	`91`	`}`
`91`	`92`	`else {`
`92`	`93`