MdeModulePkg: Fix RegularExpressionDxe memcpy intrinsic.

Use explicit CopyMem to resolve intrinsic memcpy errors on some compilers.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud <elhaj@hpe.com>
Reviewed-by: Qiu Shumin <shumin.qiu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19292 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regcomp.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regcomp.c
index 891dd3a9e825e0d22cb197c0920ebd4dec8b9d39..088450f1e4ea7eae46a27fd066be73aa519dcb2a 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regcomp.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regcomp.c
@@ -70,7 +70,9 @@ static void
 swap_node(Node* a, Node* b)\r
 {\r
   Node c;\r
-  c = *a; *a = *b; *b = c;\r
+  CopyMem (&c, a, sizeof (Node));\r
+  CopyMem (a, b, sizeof (Node));\r
+  CopyMem (b, &c, sizeof (Node));\r
 \r
   if (NTYPE(a) == NT_STR) {\r
     StrNode* sn = NSTR(a);\r
@@ -4113,7 +4115,7 @@ alt_merge_mml(MinMaxLen* to, MinMaxLen* from)
 static void\r
 copy_opt_env(OptEnv* to, OptEnv* from)\r
 {\r
-  *to = *from;\r
+  CopyMem (to, from, sizeof (OptEnv));\r
 }\r
 \r
 static void\r
@@ -4126,7 +4128,7 @@ clear_opt_anc_info(OptAncInfo* anc)
 static void\r
 copy_opt_anc_info(OptAncInfo* to, OptAncInfo* from)\r
 {\r
-  *to = *from;\r
+  CopyMem (to, from, sizeof (OptAncInfo));\r
 }\r
 \r
 static void\r
@@ -4210,7 +4212,7 @@ clear_opt_exact_info(OptExactInfo* ex)
 static void\r
 copy_opt_exact_info(OptExactInfo* to, OptExactInfo* from)\r
 {\r
-  *to = *from;\r
+  CopyMem (to, from, sizeof (OptExactInfo));\r
 }\r
 \r
 static void\r
@@ -4358,7 +4360,7 @@ clear_opt_map_info(OptMapInfo* map)
 static void\r
 copy_opt_map_info(OptMapInfo* to, OptMapInfo* from)\r
 {\r
-  *to = *from;\r
+  CopyMem (to, from, sizeof (OptMapInfo));\r
 }\r
 \r
 static void\r
@@ -4473,7 +4475,7 @@ clear_node_opt_info(NodeOptInfo* opt)
 static void\r
 copy_node_opt_info(NodeOptInfo* to, NodeOptInfo* from)\r
 {\r
-  *to = *from;\r
+  CopyMem (to, from, sizeof (NodeOptInfo));\r
 }\r
 \r
 static void\r

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
index b0fee98a1678454cc2df80a873679d096fa492d8..a87fbfc426c047a5e71b839f0b5616f011d98b29 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
@@ -2217,7 +2217,7 @@ onig_reduce_nested_quantifier(Node* pnode, Node* cnode)
 \r
   switch(ReduceTypeTable[cnum][pnum]) {\r
   case RQ_DEL:\r
-    *pnode = *cnode;\r
+    CopyMem (pnode, cnode, sizeof (Node));\r
     break;\r
   case RQ_A:\r
     p->target = c->target;\r