From df082f757af50994a2c5202236449694b446e16b Mon Sep 17 00:00:00 2001 From: Hao Wu Date: Mon, 20 Mar 2017 16:24:09 +0800 Subject: 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. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Liming Gao (cherry picked from commit 7a14d54f6c50a1ff73351e4aaee8570ec5f8a476) --- 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); -- cgit v1.2.3