From e0db09cd1cd35a1e2ae627e305d903652555aef2 Mon Sep 17 00:00:00 2001 From: Yonghong Zhu Date: Fri, 2 Feb 2018 15:46:08 +0800 Subject: BaseTools: enhance error check for DatumType format Add a check for DatumType format, eg: VOID *, original Tool will crash but no detail error message which cause confusion to user. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/Workspace/DecBuildData.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'BaseTools/Source/Python/Workspace/DecBuildData.py') diff --git a/BaseTools/Source/Python/Workspace/DecBuildData.py b/BaseTools/Source/Python/Workspace/DecBuildData.py index 2fd3820dcc..2266b0b7a6 100644 --- a/BaseTools/Source/Python/Workspace/DecBuildData.py +++ b/BaseTools/Source/Python/Workspace/DecBuildData.py @@ -1,7 +1,7 @@ ## @file # This file is used to create a database used by build tool # -# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -423,6 +423,11 @@ class DecBuildData(PackageBuildClassObject): continue DefaultValue, DatumType, TokenNumber = AnalyzePcdData(Setting) + if DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64, TAB_VOID, "BOOLEAN"]: + StructPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*$') + if StructPattern.match(DatumType) == None: + EdkLogger.error('build', FORMAT_INVALID, "DatumType only support BOOLEAN, UINT8, UINT16, UINT32, UINT64, VOID* or a valid struct name.", File=self.MetaFile, Line=LineNo) + validateranges, validlists, expressions = self._RawData.GetValidExpression(TokenSpaceGuid, PcdCName) PcdObj = PcdClassObject( PcdCName, -- cgit v1.2.3