sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools/Source/Python: Verify TAB_TOD_DEFINES_FAMILY key present

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3344

Veify that TAB_TOD_DEFINES_FAMILY key is present in ToolDef
dictionary before access.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
Michael D Kinney
2021-04-20 10:28:12 -07:00
committed by mergify[bot]
parent 61680cac5e
commit f2f4c6be2d
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
BaseTools/Source/Python/AutoGen/ModuleAutoGenHelper.py
View File

@@ -1,7 +1,7 @@
## @file ## @file
# Create makefile for MS nmake and GNU make # Create makefile for MS nmake and GNU make
# #
# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
from __future__ import absolute_import from __future__ import absolute_import
@@ -178,8 +178,11 @@ class AutoGenInfo(object):
if ToolDef[Tool].get(TAB_TOD_DEFINES_BUILDRULEFAMILY, "") != "": if ToolDef[Tool].get(TAB_TOD_DEFINES_BUILDRULEFAMILY, "") != "":
if Family != ToolDef[Tool][TAB_TOD_DEFINES_BUILDRULEFAMILY]: if Family != ToolDef[Tool][TAB_TOD_DEFINES_BUILDRULEFAMILY]:
continue continue
elif Family != ToolDef[Tool][TAB_TOD_DEFINES_FAMILY]: else:
continue if ToolDef[Tool].get(TAB_TOD_DEFINES_FAMILY, "") == "":
continue
if Family != ToolDef[Tool][TAB_TOD_DEFINES_FAMILY]:
continue
FamilyMatch = True FamilyMatch = True
# expand any wildcard # expand any wildcard
if Target == TAB_STAR or Target == self.BuildTarget: if Target == TAB_STAR or Target == self.BuildTarget:
@@ -213,6 +216,8 @@ class AutoGenInfo(object):
if Tool not in ToolDef or Family == "": if Tool not in ToolDef or Family == "":
continue continue
# option has been added before # option has been added before
if TAB_TOD_DEFINES_FAMILY not in ToolDef[Tool]:
continue
if Family != ToolDef[Tool][TAB_TOD_DEFINES_FAMILY]: if Family != ToolDef[Tool][TAB_TOD_DEFINES_FAMILY]:
continue continue

9
BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
View File

@@ -1474,8 +1474,11 @@ class PlatformAutoGen(AutoGen):
if ToolDef[Tool].get(TAB_TOD_DEFINES_BUILDRULEFAMILY, "") != "": if ToolDef[Tool].get(TAB_TOD_DEFINES_BUILDRULEFAMILY, "") != "":
if Family != ToolDef[Tool][TAB_TOD_DEFINES_BUILDRULEFAMILY]: if Family != ToolDef[Tool][TAB_TOD_DEFINES_BUILDRULEFAMILY]:
continue continue
elif Family != ToolDef[Tool][TAB_TOD_DEFINES_FAMILY]: else:
continue if ToolDef[Tool].get(TAB_TOD_DEFINES_FAMILY, "") == "":
continue
if Family != ToolDef[Tool][TAB_TOD_DEFINES_FAMILY]:
continue
FamilyMatch = True FamilyMatch = True
# expand any wildcard # expand any wildcard
if Target == TAB_STAR or Target == self.BuildTarget: if Target == TAB_STAR or Target == self.BuildTarget:
@@ -1509,6 +1512,8 @@ class PlatformAutoGen(AutoGen):
if Tool not in ToolDef or Family == "": if Tool not in ToolDef or Family == "":
continue continue
# option has been added before # option has been added before
if TAB_TOD_DEFINES_FAMILY not in ToolDef[Tool]:
continue
if Family != ToolDef[Tool][TAB_TOD_DEFINES_FAMILY]: if Family != ToolDef[Tool][TAB_TOD_DEFINES_FAMILY]:
continue continue