I fixed following bugs in EDKII.

[mirror_edk2.git] / EdkModulePkg / Core / Dxe / Image / Image.c

diff --git a/EdkModulePkg/Core/Dxe/Image/Image.c b/EdkModulePkg/Core/Dxe/Image/Image.c
index d77f4c4fca23c5af4ab7b14cd66fd07bddac1c0c..0bef1ff82ed6aa12a0f85a294565f112d999ccea 100644 (file)
--- a/EdkModulePkg/Core/Dxe/Image/Image.c
+++ b/EdkModulePkg/Core/Dxe/Image/Image.c
@@ -595,6 +595,7 @@ Returns:
   EFI_DEVICE_PATH_PROTOCOL   *HandleFilePath;\r
   UINTN                      FilePathSize;\r
 \r
+  SecurityStatus = EFI_SUCCESS;\r
 \r
   ASSERT (gEfiCurrentTpl < EFI_TPL_NOTIFY);\r
   ParentImage = NULL;\r
@@ -753,6 +754,8 @@ Done:
       CoreUnloadAndCloseImage (Image, (BOOLEAN)(DstBuffer == 0));\r
       *ImageHandle = NULL;\r
     }\r
+  } else if (EFI_ERROR (SecurityStatus)) {\r
+    Status = SecurityStatus;\r
   }\r
 \r
   return Status;\r
@@ -905,7 +908,7 @@ Arguments:
   ExitData        - Pointer to a pointer to a data buffer that includes a Null-terminated\r
                     Unicode string, optionally followed by additional binary data. The string\r
                     is a description that the caller may use to further indicate the reason for\r
-                    the image¡¯s exit.\r
+                    the image's exit.\r
 \r
 Returns:\r
 \r
@@ -1209,13 +1212,13 @@ Arguments:
 \r
   ImageHandle       - Handle that identifies the image. This parameter is passed to the image\r
                       on entry.\r
-  Status            - The image¡¯s exit code.\r
+  Status            - The image's exit code.\r
   ExitDataSize      - The size, in bytes, of ExitData. Ignored if ExitStatus is\r
                       EFI_SUCCESS.\r
   ExitData          - Pointer to a data buffer that includes a Null-terminated Unicode string,\r
                       optionally followed by additional binary data. The string is a\r
                       description that the caller may use to further indicate the reason for\r
-                      the image¡¯s exit.\r
+                      the image's exit.\r
 \r
 Returns:\r
 \r