Use if (Image->Started) condition judgement before call to UnregisterMemoryProfileImage() in CoreUnloadAndCloseImage().
Cc: Jiewen Yao <jiewen....@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng <star.z...@intel.com> --- MdeModulePkg/Core/Dxe/Image/Image.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c index 33686a6..ea6b2c6 100644 --- a/MdeModulePkg/Core/Dxe/Image/Image.c +++ b/MdeModulePkg/Core/Dxe/Image/Image.c @@ -1,7 +1,7 @@ /** @file Core image handling services to load and unload PeImage. -Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -858,6 +858,10 @@ CoreUnloadAndCloseImage ( HandleBuffer = NULL; ProtocolGuidArray = NULL; + if (Image->Started) { + UnregisterMemoryProfileImage (Image); + } + if (Image->Ebc != NULL) { // // If EBC protocol exists we must perform cleanups for this image. @@ -1854,7 +1858,6 @@ CoreUnloadImage ( Status = EFI_INVALID_PARAMETER; goto Done; } - UnregisterMemoryProfileImage (Image); if (Image->Started) { // -- 1.9.5.msysgit.0 ------------------------------------------------------------------------------ _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel