Merge pull request #661 from bigtreetech/master

[bugfix] Restore overflowed memory copy
rogerclarkmelbourne · Sep 14, 2019 · b14d08c · b14d08c
2 parents 1b6baa5 + 1264166
commit b14d08c
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/STM32F1/cores/maple/libmaple/usb/usb_lib/usb_mem.c b/STM32F1/cores/maple/libmaple/usb/usb_lib/usb_mem.c
@@ -59,14 +59,15 @@ void UserToPMABufferCopy(const u8 *pbUsrBuf, u16 wPMABufAddr, u16 wNBytes)
 *******************************************************************************/
 void PMAToUserBufferCopy(u8 *pbUsrBuf, u16 wPMABufAddr, u16 wNBytes)
 {
-  u32 n = (wNBytes + 1) >> 1;/* /2*/
-  u32 i;
-  u32 *pdwVal;
-  pdwVal = (u32 *)(wPMABufAddr * 2 + PMAAddr);
-  for (i = n; i != 0; i--)
+  u16 * destPtr = (u16*)pbUsrBuf;
+  u32 * pdwVal = (u32 *)(wPMABufAddr * 2 + PMAAddr);
+  for (u16 i = wNBytes/2; i > 0; i--)
   {
-    *(u16*)pbUsrBuf++ = *pdwVal++;
-    pbUsrBuf++;
+    *destPtr++ = (u16)*pdwVal++;
+  }
+  if (wNBytes & 0x1) // odd value ?
+  {
+    *(u8*)destPtr = *(u8*)pdwVal;
   }
 }