From 7162fdb037fb9385f6bd7d0dc55d54029b810de2 Mon Sep 17 00:00:00 2001 From: Ruiyu Ni Date: Mon, 5 Feb 2018 15:53:20 +0800 Subject: [PATCH 1/1] ShellPkg/for: Fix potential null pointer deference When "FOR %a %a IN A B C" is executed, CurrentScriptFile->CurrentCommand->Data is NULL. But the code assumes it's not NULL and tries to deference it. The patch fixes this issue. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni Reviewed-by: Jaben Carsey --- ShellPkg/Library/UefiShellLevel1CommandsLib/For.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c index 3db4bb58d3..9824977149 100644 --- a/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c +++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c @@ -2,7 +2,7 @@ Main file for endfor and for shell level 1 functions. (C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
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 @@ -624,7 +624,9 @@ ShellCommandRunFor ( if (CurrentScriptFile != NULL && CurrentScriptFile->CurrentCommand != NULL) { Info = (SHELL_FOR_INFO*)CurrentScriptFile->CurrentCommand->Data; if (CurrentScriptFile->CurrentCommand->Reset) { - Info->CurrentValue = (CHAR16*)Info->Set; + if (Info != NULL) { + Info->CurrentValue = (CHAR16*)Info->Set; + } FirstPass = TRUE; CurrentScriptFile->CurrentCommand->Reset = FALSE; } -- 2.39.2