arduino
diff --git a/‎cores/arduino/USB/SAMD21_USBDevice.h
Copy file name to clipboardExpand all lines: cores/arduino/USB/SAMD21_USBDevice.h
+5Lines changed: 5 additions & 0 deletions b/‎cores/arduino/USB/SAMD21_USBDevice.h
Copy file name to clipboardExpand all lines: cores/arduino/USB/SAMD21_USBDevice.h
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎cores/arduino/USB/USBCore.cpp
Copy file name to clipboardExpand all lines: cores/arduino/USB/USBCore.cpp
+4-3Lines changed: 4 additions & 3 deletions b/‎cores/arduino/USB/USBCore.cpp
Copy file name to clipboardExpand all lines: cores/arduino/USB/USBCore.cpp
+4-3Lines changed: 4 additions & 3 deletions
@@ -254,6 +254,11 @@ class DoubleBufferedEPOutHandler : public EPHandler {
 		release();
 	}
 
+	~DoubleBufferedEPOutHandler() {
+		free((void*)data0);
+		free((void*)data1);
+	}
+
 	virtual uint32_t recv(void *_data, uint32_t len)
 	{
 		uint8_t *data = reinterpret_cast<uint8_t *>(_data);
 
@@ -91,7 +91,7 @@ uint8_t udd_ep_in_cache_buffer[7][64];
 // Some EP are handled using EPHanlders.
 // Possibly all the sparse EP handling subroutines will be
 // converted into reusable EPHandlers in the future.
-static EPHandler *epHandlers[7];
+static EPHandler *epHandlers[7] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL};
 
 //==================================================================
 
@@ -454,9 +454,10 @@ void USBDeviceClass::initEP(uint32_t ep, uint32_t config)
 	}
 	else if (config == (USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_OUT(0)))
 	{
-		if (epHandlers[ep] == NULL) {
-			epHandlers[ep] = new DoubleBufferedEPOutHandler(usbd, ep, 256);
+		if (epHandlers[ep] != NULL) {
+			delete (DoubleBufferedEPOutHandler*)epHandlers[ep];
 		}
+		epHandlers[ep] = new DoubleBufferedEPOutHandler(usbd, ep, 256);
 	}
 	else if (config == (USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_IN(0)))
 	{
Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,11 @@ class DoubleBufferedEPOutHandler : public EPHandler {`
`254`	`254`	`release();`
`255`	`255`	`}`
`256`	`256`
	`257`	`+ ~DoubleBufferedEPOutHandler() {`
	`258`	`+ free((void*)data0);`
	`259`	`+ free((void*)data1);`
	`260`	`+ }`
	`261`	`+`
`257`	`262`	`virtual uint32_t recv(void *_data, uint32_t len)`
`258`	`263`	`{`
`259`	`264`	`uint8_t data = reinterpret_cast<uint8_t >(_data);`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ uint8_t udd_ep_in_cache_buffer[7][64];`
`91`	`91`	`// Some EP are handled using EPHanlders.`
`92`	`92`	`// Possibly all the sparse EP handling subroutines will be`
`93`	`93`	`// converted into reusable EPHandlers in the future.`
`94`		`-static EPHandler *epHandlers[7];`
	`94`	`+static EPHandler *epHandlers[7] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL};`
`95`	`95`
`96`	`96`	`//==================================================================`
`97`	`97`
`@@ -454,9 +454,10 @@ void USBDeviceClass::initEP(uint32_t ep, uint32_t config)`
`454`	`454`	`}`
`455`	`455`	`else if (config == (USB_ENDPOINT_TYPE_BULK \| USB_ENDPOINT_OUT(0)))`
`456`	`456`	`{`
`457`		`- if (epHandlers[ep] == NULL) {`
`458`		`- epHandlers[ep] = new DoubleBufferedEPOutHandler(usbd, ep, 256);`
	`457`	`+ if (epHandlers[ep] != NULL) {`
	`458`	`+ delete (DoubleBufferedEPOutHandler*)epHandlers[ep];`
`459`	`459`	`}`
	`460`	`+ epHandlers[ep] = new DoubleBufferedEPOutHandler(usbd, ep, 256);`
`460`	`461`	`}`
`461`	`462`	`else if (config == (USB_ENDPOINT_TYPE_BULK \| USB_ENDPOINT_IN(0)))`
`462`	`463`	`{`