From 641370270f9b0386ca273c187bde8e6083c7cb98 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Mon, 6 Dec 2010 05:17:09 +0000 Subject: Sync EDKII BaseTools to BaseTools project r2100. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11118 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Source/C/Common/ParseInf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'BaseTools/Source/C/Common') diff --git a/BaseTools/Source/C/Common/ParseInf.c b/BaseTools/Source/C/Common/ParseInf.c index eb01d30527..bbccb61732 100644 --- a/BaseTools/Source/C/Common/ParseInf.c +++ b/BaseTools/Source/C/Common/ParseInf.c @@ -506,11 +506,19 @@ Returns: // // Add each character to the result // - if (IsHex || (AsciiString[Index] == '0' && (AsciiString[Index + 1] == 'x' || AsciiString[Index + 1] == 'X'))) { + + // + // Skip first two chars only if the string starts with '0x' or '0X' + // + if (AsciiString[Index] == '0' && (AsciiString[Index + 1] == 'x' || AsciiString[Index + 1] == 'X')) { + IsHex = TRUE; + Index += 2; + } + if (IsHex) { // // Convert the hex string. // - for (Index = Index + 2; AsciiString[Index] != '\0'; Index++) { + for (; AsciiString[Index] != '\0'; Index++) { CurrentChar = AsciiString[Index]; if (CurrentChar == ' ') { break; -- cgit v1.2.3