Index: UefiFileHandleLib.c
===================================================================
--- UefiFileHandleLib.c	(revision 15562)
+++ UefiFileHandleLib.c	(working copy)
@@ -119,11 +119,9 @@
   )
 {
 
-  //
-  // ASSERT if the FileHandle or FileInfo is NULL
-  //
-  ASSERT (FileHandle != NULL);
-  ASSERT (FileInfo   != NULL);
+  if (FileHandle == NULL || FileInfo == NULL) {
+    return (EFI_INVALID_PARAMETER);
+  }
 
   //
   // Set the info
@@ -171,10 +169,9 @@
   OUT VOID                      *Buffer
   )
 {
-  //
-  // ASSERT if FileHandle is NULL
-  //
-  ASSERT (FileHandle != NULL);
+  if (FileHandle == NULL) {
+    return (EFI_INVALID_PARAMETER);
+  }
 
   //
   // Perform the read based on EFI_FILE_PROTOCOL
@@ -215,11 +212,11 @@
   IN VOID                       *Buffer
   )
 {
+  if (FileHandle == NULL) {
+    return (EFI_INVALID_PARAMETER);
+  }
+
   //
-  // ASSERT if FileHandle is NULL
-  //
-  ASSERT (FileHandle != NULL);
-  //
   // Perform the write based on EFI_FILE_PROTOCOL
   //
   return (FileHandle->Write(FileHandle, BufferSize, Buffer));
@@ -243,11 +240,12 @@
   )
 {
   EFI_STATUS Status;
+
+  if (FileHandle == NULL) {
+    return (EFI_INVALID_PARAMETER);
+  }
+
   //
-  // ASSERT if FileHandle is NULL
-  //
-  ASSERT (FileHandle != NULL);
-  //
   // Perform the Close based on EFI_FILE_PROTOCOL
   //
   Status = FileHandle->Close(FileHandle);
@@ -275,11 +273,12 @@
   )
 {
   EFI_STATUS Status;
+
+  if (FileHandle == NULL) {
+    return (EFI_INVALID_PARAMETER);
+  }
+
   //
-  // ASSERT if FileHandle is NULL
-  //
-  ASSERT (FileHandle != NULL);
-  //
   // Perform the Delete based on EFI_FILE_PROTOCOL
   //
   Status = FileHandle->Delete(FileHandle);
@@ -312,11 +311,11 @@
   IN UINT64             Position
   )
 {
+  if (FileHandle == NULL) {
+    return (EFI_INVALID_PARAMETER);
+  }
+
   //
-  // ASSERT if FileHandle is NULL
-  //
-  ASSERT (FileHandle != NULL);
-  //
   // Perform the SetPosition based on EFI_FILE_PROTOCOL
   //
   return (FileHandle->SetPosition(FileHandle, Position));
@@ -344,14 +343,11 @@
   OUT UINT64                    *Position
   )
 {
-  if (Position == NULL) {
+  if (Position == NULL || FileHandle == NULL) {
     return (EFI_INVALID_PARAMETER);
   }
+
   //
-  // ASSERT if FileHandle is NULL
-  //
-  ASSERT (FileHandle != NULL);
-  //
   // Perform the GetPosition based on EFI_FILE_PROTOCOL
   //
   return (FileHandle->GetPosition(FileHandle, Position));
@@ -376,11 +372,11 @@
   IN EFI_FILE_HANDLE            FileHandle
   )
 {
+  if (FileHandle == NULL) {
+    return (EFI_INVALID_PARAMETER);
+  }
+
   //
-  // ASSERT if FileHandle is NULL
-  //
-  ASSERT (FileHandle != NULL);
-  //
   // Perform the Flush based on EFI_FILE_PROTOCOL
   //
   return (FileHandle->Flush(FileHandle));
@@ -389,7 +385,7 @@
 /**
   function to determine if a given handle is a directory handle
 
-  if DirHandle is NULL then ASSERT()
+  if DirHandle is NULL then return error
 
   open the file information on the DirHandle and verify that the Attribute
   includes EFI_FILE_DIRECTORY bit set.
@@ -408,10 +404,9 @@
 {
   EFI_FILE_INFO *DirInfo;
 
-  //
-  // ASSERT if DirHandle is NULL
-  //
-  ASSERT(DirHandle != NULL);
+  if (DirHandle == NULL) {
+    return (EFI_INVALID_PARAMETER);
+  }
 
   //
   // get the file information for DirHandle
@@ -549,12 +544,9 @@
   EFI_STATUS    Status;
   UINTN         BufferSize;
 
-  //
-  // ASSERTs for DirHandle or Buffer or NoFile poitners being NULL
-  //
-  ASSERT (DirHandle != NULL);
-  ASSERT (Buffer    != NULL);
-  ASSERT (NoFile    != NULL);
+  if (DirHandle == NULL || Buffer == NULL || NoFile == NULL) {
+    return (EFI_INVALID_PARAMETER);
+  }
 
   //
   // This BufferSize MUST stay equal to the originally allocated one in GetFirstFile
@@ -584,8 +576,8 @@
 /**
   Retrieve the size of a file.
 
-  if FileHandle is NULL then ASSERT()
-  if Size is NULL then ASSERT()
+  if FileHandle is NULL then return error
+  if Size is NULL then return error
 
   This function extracts the file size info from the FileHandle's EFI_FILE_INFO
   data.
@@ -605,11 +597,9 @@
 {
   EFI_FILE_INFO                 *FileInfo;
 
-  //
-  // ASSERT for FileHandle or Size being NULL
-  //
-  ASSERT (FileHandle != NULL);
-  ASSERT (Size != NULL);
+  if (FileHandle == NULL || Size == NULL) {
+    return (EFI_INVALID_PARAMETER);
+  }
 
   //
   // get the FileInfo structure
@@ -635,7 +625,7 @@
 /**
   Set the size of a file.
 
-  If FileHandle is NULL then ASSERT().
+  If FileHandle is NULL then return error.
 
   This function changes the file size info from the FileHandle's EFI_FILE_INFO
   data.
@@ -656,10 +646,9 @@
   EFI_FILE_INFO                 *FileInfo;
   EFI_STATUS                    Status;
 
-  //
-  // ASSERT for FileHandle or Size being NULL
-  //
-  ASSERT (FileHandle != NULL);
+  if (FileHandle == NULL) {
+    return (EFI_INVALID_PARAMETER);
+  }
 
   //
   // get the FileInfo structure
@@ -701,7 +690,7 @@
   If Source is NULL, there is nothing to append, just return the current buffer in
   Destination.
 
-  if Destination is NULL, then ASSERT()
+  if Destination is NULL, then return error
   if Destination's current length (including NULL terminator) is already more then
   CurrentSize, then ASSERT()
 
@@ -728,10 +717,9 @@
   UINTN NewSize;
   UINTN CopySize;
 
-  //
-  // ASSERTs
-  //
-  ASSERT(Destination != NULL);
+  if (Destination == NULL) {
+    return (NULL);
+  }
 
   //
   // If there's nothing to do then just return Destination
@@ -964,12 +952,11 @@
 
   if (Handle == NULL
     ||Size   == NULL
+    ||(Buffer==NULL&&*Size!=0)
    ){
     return (EFI_INVALID_PARAMETER);
   }
-  if (Buffer == NULL) {
-    ASSERT(*Size == 0);
-  } else {
+  if (Buffer != NULL) {
     *Buffer = CHAR_NULL;
   }
   FileHandleGetPosition(Handle, &OriginalFilePosition);
@@ -1032,7 +1019,7 @@
 /**
   function to write a line of unicode text to a file.
 
-  if Handle is NULL, ASSERT.
+  if Handle is NULL, return error.
   if Buffer is NULL, do nothing.  (return SUCCESS)
 
   @param[in]     Handle         FileHandle to write to
@@ -1053,12 +1040,14 @@
   EFI_STATUS Status;
   UINTN      Size;
 
-  ASSERT(Handle != NULL);
-
   if (Buffer == NULL) {
     return (EFI_SUCCESS);
   }
 
+  if (Handle == NULL) {
+    return (EFI_INVALID_PARAMETER);
+  }
+
   Size = StrSize(Buffer) - sizeof(Buffer[0]);
   Status = FileHandleWrite(Handle, &Size, Buffer);
   if (EFI_ERROR(Status)) {
@@ -1096,7 +1085,9 @@
   // Get a buffer to print into
   //
   Buffer = AllocateZeroPool (PcdGet16 (PcdShellPrintBufferSize));
-  ASSERT (Buffer != NULL);
+  if (Buffer == NULL) {
+    return (EFI_OUT_OF_RESOURCES);
+  }
 
   //
   // Print into our buffer
@@ -1122,7 +1113,7 @@
 
   This will NOT work on directories.
 
-  If Handle is NULL, then ASSERT.
+  If Handle is NULL, then return False.
 
   @param[in] Handle     the file handle
 
@@ -1139,20 +1130,19 @@
   UINT64        Pos;
   BOOLEAN       RetVal;
 
-  //
-  // ASSERT if Handle is NULL
-  //
-  ASSERT(Handle != NULL);
+  if (Handle == NULL) {
+    return (FALSE);
+  }
 
   FileHandleGetPosition(Handle, &Pos);
   Info = FileHandleGetInfo (Handle);
-  ASSERT(Info != NULL);
-  FileHandleSetPosition(Handle, Pos);
 
   if (Info == NULL) {
     return (FALSE);
   }
 
+  FileHandleSetPosition(Handle, Pos);
+
   if (Pos == Info->FileSize) {
     RetVal = TRUE;
   } else {