Sync bug fix in Edk r10821 to PeiMemoryLib and UefiMemoryLib instances.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10822 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c b/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c
index db56b503d55767f70d7861c2f7dfd2bcabf7b7b0..53f1cafa42adcddc101c11d7600ac56305703dd7 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c
+++ b/MdePkg/Library/PeiMemoryLib/MemLibGeneric.c
@@ -163,7 +163,7 @@ InternalMemScanMem8 (
   Pointer = (CONST UINT8*)Buffer;\r
   do {\r
     if (*(Pointer++) == Value) {\r
-      return Pointer;\r
+      return --Pointer;\r
     }\r
   } while (--Length != 0);\r
   return NULL;\r
@@ -193,7 +193,7 @@ InternalMemScanMem16 (
   Pointer = (CONST UINT16*)Buffer;\r
   do {\r
     if (*(Pointer++) == Value) {\r
-      return Pointer;\r
+      return --Pointer;\r
     }\r
   } while (--Length != 0);\r
   return NULL;\r
@@ -223,7 +223,7 @@ InternalMemScanMem32 (
   Pointer = (CONST UINT32*)Buffer;\r
   do {\r
     if (*(Pointer++) == Value) {\r
-      return Pointer;\r
+      return --Pointer;\r
     }\r
   } while (--Length != 0);\r
   return NULL;\r
@@ -253,7 +253,7 @@ InternalMemScanMem64 (
   Pointer = (CONST UINT64*)Buffer;\r
   do {\r
     if (*(Pointer++) == Value) {\r
-      return Pointer;\r
+      return --Pointer;\r
     }\r
   } while (--Length != 0);\r
   return NULL;\r

diff --git a/MdePkg/Library/UefiMemoryLib/MemLibGeneric.c b/MdePkg/Library/UefiMemoryLib/MemLibGeneric.c
index 2780cbfd9bad9db275c42b97eac3f6b794cc6d85..1ec8bf6bad402e56d5f40a6e4d60699cc8aa199e 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/MemLibGeneric.c
+++ b/MdePkg/Library/UefiMemoryLib/MemLibGeneric.c
@@ -163,7 +163,7 @@ InternalMemScanMem8 (
   Pointer = (CONST UINT8*)Buffer;\r
   do {\r
     if (*(Pointer++) == Value) {\r
-      return Pointer;\r
+      return --Pointer;\r
     }\r
   } while (--Length != 0);\r
   return NULL;\r
@@ -193,7 +193,7 @@ InternalMemScanMem16 (
   Pointer = (CONST UINT16*)Buffer;\r
   do {\r
     if (*(Pointer++) == Value) {\r
-      return Pointer;\r
+      return --Pointer;\r
     }\r
   } while (--Length != 0);\r
   return NULL;\r
@@ -223,7 +223,7 @@ InternalMemScanMem32 (
   Pointer = (CONST UINT32*)Buffer;\r
   do {\r
     if (*(Pointer++) == Value) {\r
-      return Pointer;\r
+      return --Pointer;\r
     }\r
   } while (--Length != 0);\r
   return NULL;\r
@@ -253,7 +253,7 @@ InternalMemScanMem64 (
   Pointer = (CONST UINT64*)Buffer;\r
   do {\r
     if (*(Pointer++) == Value) {\r
-      return Pointer;\r
+      return --Pointer;\r
     }\r
   } while (--Length != 0);\r
   return NULL;\r