From 83adb828a3cbbe92d1650743f360fd20dfdb681f Mon Sep 17 00:00:00 2001 From: Ruiyu Ni Date: Thu, 28 Jul 2016 12:46:25 +0800 Subject: ShellPkg: Unregister hotkey callback when exiting Shell Commit 9168df3dea65f707d1e9c32eba5e18ef6b84e5cd "ShellPkg/ShellProtocol.c: Handle memory allocation failure" only keeps the protocol clean up in CleanUpShellProtocol() and creates a new function CleanUpShellEnvironment() which calls CleanUpShellProtocol(), then unregisters the hotkey callback. But the commit forgot to change the Shell.c to call CleanUpShellEnvironment() which causes the hotkey callback is not unregistered while the callback function doesn't exist when Shell exits. This causes system hang when pressing CTRL+C after exiting shell. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Reviewed-by: Eric Dong (cherry picked from commit 031403460c9782a2563a81a6065ded99046960c2) --- ShellPkg/Application/Shell/Shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ShellPkg') diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c index 0f1fb9c287..3080a1644f 100644 --- a/ShellPkg/Application/Shell/Shell.c +++ b/ShellPkg/Application/Shell/Shell.c @@ -667,7 +667,7 @@ FreeResources: if (ShellInfoObject.NewEfiShellProtocol->IsRootShell()){ InternalEfiShellSetEnv(L"cwd", NULL, TRUE); } - CleanUpShellProtocol(ShellInfoObject.NewEfiShellProtocol); + CleanUpShellEnvironment (ShellInfoObject.NewEfiShellProtocol); DEBUG_CODE(ShellInfoObject.NewEfiShellProtocol = NULL;); } -- cgit v1.2.3