Index: Include/Library/BaseLib.h
===================================================================
--- Include/Library/BaseLib.h	(revision 17286)
+++ Include/Library/BaseLib.h	(working copy)
@@ -211,6 +211,7 @@
 
   If Destination is not aligned on a 16-bit boundary, then ASSERT().
   If Source is not aligned on a 16-bit boundary, then ASSERT().
+  If below constraints are violated, then ASSERT() and error status is returned.
 
   @param  Destination              A pointer to a Null-terminated Unicode string.
   @param  DestMax                  The maximum number of Destination Unicode
@@ -275,6 +276,7 @@
 
   If Destination is not aligned on a 16-bit boundary, then ASSERT().
   If Source is not aligned on a 16-bit boundary, then ASSERT().
+  If below constraints are violated, then ASSERT() and error status is returned.
 
   @param  Destination              A pointer to a Null-terminated Unicode string.
   @param  DestMax                  The maximum number of Destination Unicode
@@ -309,7 +311,8 @@
   set to null.
 
   If Destination is not aligned on a 16-bit boundary, then ASSERT().
-  If and Source is not aligned on a 16-bit boundary, then ASSERT().
+  If Source is not aligned on a 16-bit boundary, then ASSERT().
+  If below constraints are violated, then ASSERT() and error status is returned.
 
   @param  Destination              A pointer to a Null-terminated Unicode string.
   @param  DestMax                  The maximum number of Destination Unicode
@@ -362,6 +365,8 @@
   Copies the string pointed to by Source (including the terminating null char)
   to the array pointed to by Destination.
 
+  If below constraints are violated, then ASSERT() and error status is returned.
+
   @param  Destination              A pointer to a Null-terminated Ascii string.
   @param  DestMax                  The maximum number of Destination Ascii
                                    char, including terminating null char.
@@ -390,6 +395,8 @@
   Source to the array pointed to by Destination. If no null char is copied from
   Source, then Destination[Length] is always set to null.
 
+  If below constraints are violated, then ASSERT() and error status is returned.
+
   @param  Destination              A pointer to a Null-terminated Ascii string.
   @param  DestMax                  The maximum number of Destination Ascii
                                    char, including terminating null char.
@@ -420,6 +427,8 @@
   Appends a copy of the string pointed to by Source (including the terminating
   null char) to the end of the string pointed to by Destination.
 
+  If below constraints are violated, then ASSERT() and error status is returned.
+
   @param  Destination              A pointer to a Null-terminated Ascii string.
   @param  DestMax                  The maximum number of Destination Ascii
                                    char, including terminating null char.
@@ -452,6 +461,8 @@
   copied from Source, then Destination[StrLen(Destination) + Length] is always
   set to null.
 
+  If below constraints are violated, then ASSERT() and error status is returned.
+
   @param  Destination              A pointer to a Null-terminated Ascii string.
   @param  DestMax                  The maximum number of Destination Ascii
                                    char, including terminating null char.
Index: Library/BaseLib/SafeString.c
===================================================================
--- Library/BaseLib/SafeString.c	(revision 17286)
+++ Library/BaseLib/SafeString.c	(working copy)
@@ -153,6 +153,7 @@
 
   If Destination is not aligned on a 16-bit boundary, then ASSERT().
   If Source is not aligned on a 16-bit boundary, then ASSERT().
+  If below constraints are violated, then ASSERT() and error status is returned.
 
   @param  Destination              A pointer to a Null-terminated Unicode string.
   @param  DestMax                  The maximum number of Destination Unicode
@@ -230,6 +231,7 @@
 
   If Length > 0 and Destination is not aligned on a 16-bit boundary, then ASSERT().
   If Length > 0 and Source is not aligned on a 16-bit boundary, then ASSERT().
+  If below constraints are violated, then ASSERT() and error status is returned.
 
   @param  Destination              A pointer to a Null-terminated Unicode string.
   @param  DestMax                  The maximum number of Destination Unicode
@@ -318,6 +320,7 @@
 
   If Destination is not aligned on a 16-bit boundary, then ASSERT().
   If Source is not aligned on a 16-bit boundary, then ASSERT().
+  If below constraints are violated, then ASSERT() and error status is returned.
 
   @param  Destination              A pointer to a Null-terminated Unicode string.
   @param  DestMax                  The maximum number of Destination Unicode
@@ -413,7 +416,8 @@
   set to null.
 
   If Destination is not aligned on a 16-bit boundary, then ASSERT().
-  If and Source is not aligned on a 16-bit boundary, then ASSERT().
+  If Source is not aligned on a 16-bit boundary, then ASSERT().
+  If below constraints are violated, then ASSERT() and error status is returned.
 
   @param  Destination              A pointer to a Null-terminated Unicode string.
   @param  DestMax                  The maximum number of Destination Unicode
@@ -557,6 +561,8 @@
   Copies the string pointed to by Source (including the terminating null char)
   to the array pointed to by Destination.
 
+  If below constraints are violated, then ASSERT() and error status is returned.
+
   @param  Destination              A pointer to a Null-terminated Ascii string.
   @param  DestMax                  The maximum number of Destination Ascii
                                    char, including terminating null char.
@@ -628,6 +634,8 @@
   Source to the array pointed to by Destination. If no null char is copied from
   Source, then Destination[Length] is always set to null.
 
+  If below constraints are violated, then ASSERT() and error status is returned.
+
   @param  Destination              A pointer to a Null-terminated Ascii string.
   @param  DestMax                  The maximum number of Destination Ascii
                                    char, including terminating null char.
@@ -710,6 +718,8 @@
   Appends a copy of the string pointed to by Source (including the terminating
   null char) to the end of the string pointed to by Destination.
 
+  If below constraints are violated, then ASSERT() and error status is returned.
+
   @param  Destination              A pointer to a Null-terminated Ascii string.
   @param  DestMax                  The maximum number of Destination Ascii
                                    char, including terminating null char.
@@ -800,6 +810,8 @@
   copied from Source, then Destination[StrLen(Destination) + Length] is always
   set to null.
 
+  If below constraints are violated, then ASSERT() and error status is returned.
+
   @param  Destination              A pointer to a Null-terminated Ascii string.
   @param  DestMax                  The maximum number of Destination Ascii
                                    char, including terminating null char.
