Don't reallocate USB buffers if already allocated

facchinm · sandeepmistry · commit 2bb54068a2ff · 2018-01-25T11:20:41.000-05:00
USB Configuration was meant to run only once, but if the board comes back from standby the host can reconfigure the device again. Probably a cleaner patch could be free()-ing the buffers on standby() to release the memory but at least we don't leak anymore. Fixes #293
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
@@ -454,7 +454,9 @@ void USBDeviceClass::initEP(uint32_t ep, uint32_t config)
 	}
 	else if (config == (USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_OUT(0)))
 	{
-		epHandlers[ep] = new DoubleBufferedEPOutHandler(usbd, ep, 256);
+		if (epHandlers[ep] == NULL) {
+			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
`@@ -454,7 +454,9 @@ 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`		`- epHandlers[ep] = new DoubleBufferedEPOutHandler(usbd, ep, 256);`
	`457`	`+ if (epHandlers[ep] == NULL) {`
	`458`	`+ epHandlers[ep] = new DoubleBufferedEPOutHandler(usbd, ep, 256);`
	`459`	`+ }`
`458`	`460`	`}`
`459`	`461`	`else if (config == (USB_ENDPOINT_TYPE_BULK \| USB_ENDPOINT_IN(0)))`
`460`	`462`	`{`