MdeModulePkg/Dxe/Image: Restore mCurrentImage on all paths

[edk2] [PATCH] MdeModulePkg/Dxe/Image: Restore mCurrentImage on all paths

Posted by Hao Wu 7 years, 6 months ago

This commit makes sure that in function CoreStartImage(), module
variable 'mCurrentImage' is restored to the current start image context
on all code paths.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
 MdeModulePkg/Core/Dxe/Image/Image.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 93720c85cb..03e979a604 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -1647,6 +1647,12 @@ CoreStartImage (
     //
     PERF_START (NULL, "StartImage:", NULL, Tick);
     PERF_END (NULL, "StartImage:", NULL, 0);
+
+    //
+    // Pop the current start image context
+    //
+    mCurrentImage = LastImage;
+
     return EFI_OUT_OF_RESOURCES;
   }
   Image->JumpContext = ALIGN_POINTER (Image->JumpBuffer, BASE_LIBRARY_JUMP_BUFFER_ALIGNMENT);
-- 
2.12.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] MdeModulePkg/Dxe/Image: Restore mCurrentImage on all paths

Posted by Gao, Liming 7 years, 6 months ago

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: Wu, Hao A
>Sent: Tuesday, April 11, 2017 10:14 AM
>To: edk2-devel@lists.01.org
>Cc: Wu, Hao A <hao.a.wu@intel.com>; Gao, Liming <liming.gao@intel.com>
>Subject: [PATCH] MdeModulePkg/Dxe/Image: Restore mCurrentImage on all
>paths
>
>This commit makes sure that in function CoreStartImage(), module
>variable 'mCurrentImage' is restored to the current start image context
>on all code paths.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Hao Wu <hao.a.wu@intel.com>
>---
> MdeModulePkg/Core/Dxe/Image/Image.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
>diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c
>b/MdeModulePkg/Core/Dxe/Image/Image.c
>index 93720c85cb..03e979a604 100644
>--- a/MdeModulePkg/Core/Dxe/Image/Image.c
>+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
>@@ -1647,6 +1647,12 @@ CoreStartImage (
>     //
>     PERF_START (NULL, "StartImage:", NULL, Tick);
>     PERF_END (NULL, "StartImage:", NULL, 0);
>+
>+    //
>+    // Pop the current start image context
>+    //
>+    mCurrentImage = LastImage;
>+
>     return EFI_OUT_OF_RESOURCES;
>   }
>   Image->JumpContext = ALIGN_POINTER (Image->JumpBuffer,
>BASE_LIBRARY_JUMP_BUFFER_ALIGNMENT);
>--
>2.12.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel