Fix array out of bounds in USB core

thepsr · facchinm · commit 3ee886bc4f11 · 2019-06-28T10:00:08.000+02:00
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
@@ -391,9 +391,10 @@ uint32_t EndPoints[] =
 	0,
 #endif
 };
+#define EP_ARRAY_SIZE   (sizeof(EndPoints)/sizeof(EndPoints[0]))
 
 void USBDeviceClass::initEndpoints() {
-	for (uint8_t i = 1; i < sizeof(EndPoints) && EndPoints[i] != 0; i++) {
+	for (uint8_t i = 1; (i < EP_ARRAY_SIZE) && (EndPoints[i] != 0); i++) {
 		initEP(i, EndPoints[i]);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -391,9 +391,10 @@ uint32_t EndPoints[] =`
`391`	`391`	`0,`
`392`	`392`	`#endif`
`393`	`393`	`};`
	`394`	`+#define EP_ARRAY_SIZE (sizeof(EndPoints)/sizeof(EndPoints[0]))`
`394`	`395`
`395`	`396`	`void USBDeviceClass::initEndpoints() {`
`396`		`- for (uint8_t i = 1; i < sizeof(EndPoints) && EndPoints[i] != 0; i++) {`
	`397`	`+ for (uint8_t i = 1; (i < EP_ARRAY_SIZE) && (EndPoints[i] != 0); i++) {`
`397`	`398`	`initEP(i, EndPoints[i]);`
`398`	`399`	`}`
`399`	`400`	`}`