diff options
| author | Hao Wu <hao.a.wu@intel.com> | 2017-03-20 16:24:09 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2017-05-16 09:24:51 +0800 |
| commit | dd6ec3839d98067f403d55941490f8153a78b549 (patch) | |
| tree | 41e802469de120a2dd94c8039de99855db71cca9 | |
| parent | 3dbeb69e0371a64d0b42d72a83135e95ff060c1e (diff) | |
| download | edk2-dd6ec3839d98067f403d55941490f8153a78b549.zip edk2-dd6ec3839d98067f403d55941490f8153a78b549.tar.gz edk2-dd6ec3839d98067f403d55941490f8153a78b549.tar.bz2 | |
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 <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
(cherry picked from commit 7a14d54f6c50a1ff73351e4aaee8570ec5f8a476)
| -rw-r--r-- | MdeModulePkg/Core/Dxe/Image/Image.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c index 5355940..93ae8a4 100644 --- a/MdeModulePkg/Core/Dxe/Image/Image.c +++ b/MdeModulePkg/Core/Dxe/Image/Image.c @@ -1643,6 +1643,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);
|