Sync BaseTool trunk (version r2649) into EDKII BaseTools.

[mirror_edk2.git] / BaseTools / Source / C / VfrCompile / VfrFormPkg.cpp

diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
index addff24cf6d66bd7e7066ddf2751d2dce671dbb6..6dfc118eea19c8b52df02beb75b4a22efb7cd26e 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
@@ -82,7 +82,7 @@ SPendingAssign::AssignValue (
   IN UINT32 Len\r
   )\r
 {\r
-  memcpy (mAddr, Addr, (mLen < Len ? mLen : Len));\r
+  memmove (mAddr, Addr, (mLen < Len ? mLen : Len));\r
   mFlag = ASSIGNED;\r
 }\r
 \r
@@ -685,7 +685,7 @@ CFormPkg::AdjustDynamicInsertOpcode (
     //\r
     // Override the restore buffer data.\r
     //\r
-    memcpy (LastFormEndAddr, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr);\r
+    memmove (LastFormEndAddr, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr);\r
     InsertOpcodeNode->mBufferFree -= NeedRestoreCodeLen;\r
     memset (InsertOpcodeNode->mBufferFree, 0, NeedRestoreCodeLen);\r
   } else {\r
@@ -733,7 +733,7 @@ CFormPkg::AdjustDynamicInsertOpcode (
       //\r
       // Override the restore buffer data.\r
       //\r
-      memcpy (InsertOpcodeNode->mBufferStart, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr);\r
+      memmove (InsertOpcodeNode->mBufferStart, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr);\r
       InsertOpcodeNode->mBufferFree -= InsertOpcodeAddr - InsertOpcodeNode->mBufferStart;\r
 \r
       //\r
@@ -1542,7 +1542,7 @@ CIfrObj::_EMIT_PENDING_OBJ (
   //\r
   ObjBinBuf  = gCFormPkg.IfrBinBufferGet (mObjBinLen);\r
   if (ObjBinBuf != NULL) {\r
-    memcpy (ObjBinBuf, mObjBinBuf, mObjBinLen);\r
+    memmove (ObjBinBuf, mObjBinBuf, mObjBinLen);\r
   }\r
   \r
   //\r