Fix invalid return status to sync with newest UEFI spec 2.1

[mirror_edk2.git] / MdePkg / Library / BaseLib / Unaligned.c

diff --git a/MdePkg/Library/BaseLib/Unaligned.c b/MdePkg/Library/BaseLib/Unaligned.c
index 9d0521e595b350b902fe75a705c06b996b102bbc..e7b19e4deea257052b92e380cefbfec7d1cf6b43 100644 (file)
--- a/MdePkg/Library/BaseLib/Unaligned.c
+++ b/MdePkg/Library/BaseLib/Unaligned.c
@@ -10,10 +10,14 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-  Module Name:  Unaligned.c\r
-\r
 **/\r
 \r
+//\r
+// Include common header file for this module.\r
+//\r
+#include <BaseLibInternals.h>\r
+\r
+\r
 /**\r
   Reads a 16-bit value from memory that may be unaligned.\r
 \r
@@ -33,6 +37,8 @@ ReadUnaligned16 (
   IN      CONST UINT16              *Buffer\r
   )\r
 {\r
+  ASSERT (Buffer != NULL);\r
+\r
   return *Buffer;\r
 }\r
 \r
@@ -58,6 +64,8 @@ WriteUnaligned16 (
   IN      UINT16                    Value\r
   )\r
 {\r
+  ASSERT (Buffer != NULL);\r
+\r
   return *Buffer = Value;\r
 }\r
 \r
@@ -80,6 +88,8 @@ ReadUnaligned24 (
   IN      CONST UINT32              *Buffer\r
   )\r
 {\r
+  ASSERT (Buffer != NULL);\r
+\r
   return *Buffer & 0xffffff;\r
 }\r
 \r
@@ -105,7 +115,10 @@ WriteUnaligned24 (
   IN      UINT32                    Value\r
   )\r
 {\r
-  return *Buffer = BitFieldWrite32 (*Buffer, 0, 23, Value);\r
+  ASSERT (Buffer != NULL);\r
+\r
+  *Buffer = BitFieldWrite32 (*Buffer, 0, 23, Value);\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -127,6 +140,8 @@ ReadUnaligned32 (
   IN      CONST UINT32              *Buffer\r
   )\r
 {\r
+  ASSERT (Buffer != NULL);\r
+\r
   return *Buffer;\r
 }\r
 \r
@@ -152,6 +167,8 @@ WriteUnaligned32 (
   IN      UINT32                    Value\r
   )\r
 {\r
+  ASSERT (Buffer != NULL);\r
+\r
   return *Buffer = Value;\r
 }\r
 \r
@@ -174,6 +191,8 @@ ReadUnaligned64 (
   IN      CONST UINT64              *Buffer\r
   )\r
 {\r
+  ASSERT (Buffer != NULL);\r
+\r
   return *Buffer;\r
 }\r
 \r
@@ -199,5 +218,7 @@ WriteUnaligned64 (
   IN      UINT64                    Value\r
   )\r
 {\r
+  ASSERT (Buffer != NULL);\r
+\r
   return *Buffer = Value;\r
 }\r