ArmPkg/BaseMemoryLib(Sym|Vstm): Do not post increment returned pointer

InternalMemScanMem(8|16|32|64) was returning a pointer that was
post incremented from the expected returned value.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by: Ronald Cron <ronald.cron@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17108 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Library/BaseMemoryLibStm/MemLibGeneric.c b/ArmPkg/Library/BaseMemoryLibStm/MemLibGeneric.c
index ef7874877d238dc1f00020c92bb967ffb60b872e..54c27012955f520beb0db1e99d43e2086862807d 100755 (executable)
--- a/ArmPkg/Library/BaseMemoryLibStm/MemLibGeneric.c
+++ b/ArmPkg/Library/BaseMemoryLibStm/MemLibGeneric.c
@@ -162,9 +162,10 @@ InternalMemScanMem8 (
 \r
   Pointer = (CONST UINT8*)Buffer;\r
   do {\r
-    if (*(Pointer++) == Value) {\r
+    if (*Pointer == Value) {\r
       return Pointer;\r
     }\r
+    Pointer++;\r
   } while (--Length != 0);\r
   return NULL;\r
 }\r
@@ -192,9 +193,10 @@ InternalMemScanMem16 (
 \r
   Pointer = (CONST UINT16*)Buffer;\r
   do {\r
-    if (*(Pointer++) == Value) {\r
+    if (*Pointer == Value) {\r
       return Pointer;\r
     }\r
+    Pointer++;\r
   } while (--Length != 0);\r
   return NULL;\r
 }\r
@@ -222,9 +224,10 @@ InternalMemScanMem32 (
 \r
   Pointer = (CONST UINT32*)Buffer;\r
   do {\r
-    if (*(Pointer++) == Value) {\r
+    if (*Pointer == Value) {\r
       return Pointer;\r
     }\r
+    Pointer++;\r
   } while (--Length != 0);\r
   return NULL;\r
 }\r
@@ -252,9 +255,10 @@ InternalMemScanMem64 (
 \r
   Pointer = (CONST UINT64*)Buffer;\r
   do {\r
-    if (*(Pointer++) == Value) {\r
+    if (*Pointer == Value) {\r
       return Pointer;\r
     }\r
+    Pointer++;\r
   } while (--Length != 0);\r
   return NULL;\r
 }\r

diff --git a/ArmPkg/Library/BaseMemoryLibVstm/MemLibGeneric.c b/ArmPkg/Library/BaseMemoryLibVstm/MemLibGeneric.c
index ef7874877d238dc1f00020c92bb967ffb60b872e..54c27012955f520beb0db1e99d43e2086862807d 100755 (executable)
--- a/ArmPkg/Library/BaseMemoryLibVstm/MemLibGeneric.c
+++ b/ArmPkg/Library/BaseMemoryLibVstm/MemLibGeneric.c
@@ -162,9 +162,10 @@ InternalMemScanMem8 (
 \r
   Pointer = (CONST UINT8*)Buffer;\r
   do {\r
-    if (*(Pointer++) == Value) {\r
+    if (*Pointer == Value) {\r
       return Pointer;\r
     }\r
+    Pointer++;\r
   } while (--Length != 0);\r
   return NULL;\r
 }\r
@@ -192,9 +193,10 @@ InternalMemScanMem16 (
 \r
   Pointer = (CONST UINT16*)Buffer;\r
   do {\r
-    if (*(Pointer++) == Value) {\r
+    if (*Pointer == Value) {\r
       return Pointer;\r
     }\r
+    Pointer++;\r
   } while (--Length != 0);\r
   return NULL;\r
 }\r
@@ -222,9 +224,10 @@ InternalMemScanMem32 (
 \r
   Pointer = (CONST UINT32*)Buffer;\r
   do {\r
-    if (*(Pointer++) == Value) {\r
+    if (*Pointer == Value) {\r
       return Pointer;\r
     }\r
+    Pointer++;\r
   } while (--Length != 0);\r
   return NULL;\r
 }\r
@@ -252,9 +255,10 @@ InternalMemScanMem64 (
 \r
   Pointer = (CONST UINT64*)Buffer;\r
   do {\r
-    if (*(Pointer++) == Value) {\r
+    if (*Pointer == Value) {\r
       return Pointer;\r
     }\r
+    Pointer++;\r
   } while (--Length != 0);\r
   return NULL;\r
 }\r