From 74fb6043f6d74b84f7efc282ac6cfc54fcb71882 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 21 Apr 2017 20:55:22 +0000 Subject: ovmf: Fix build with gcc7 backport a patch which fixing warnings with gcc7 Signed-off-by: Khem Raj Signed-off-by: Ross Burton --- ...g-UefiHiiLib-Fix-incorrect-comparison-exp.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch (limited to 'meta/recipes-core/ovmf/ovmf') diff --git a/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch b/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch new file mode 100644 index 0000000000..0529a27b16 --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch @@ -0,0 +1,45 @@ +From 73692710d50da1f421b0e6ddff784ca3135389b3 Mon Sep 17 00:00:00 2001 +From: Dandan Bi +Date: Sat, 1 Apr 2017 10:31:14 +0800 +Subject: [PATCH] MdeModulePkg/UefiHiiLib:Fix incorrect comparison expression + +Fix the incorrect comparison between pointer and constant zero character. + +https://bugzilla.tianocore.org/show_bug.cgi?id=416 + +V2: The pointer StringPtr points to a string returned +by ExtractConfig/ExportConfig, if it is NULL, function +InternalHiiIfrValueAction will return FALSE. So in +current usage model, the StringPtr can not be NULL before +using it, so we can add ASSERT here. + +Cc: Eric Dong +Cc: Liming Gao +Contributed-under: TianoCore Contribution Agreement 1.0 +Signed-off-by: Dandan Bi +Reviewed-by: Eric Dong +--- +Upstream-Status: Backport + + MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c +index 8579501..46ca7bc 100644 +--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c ++++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c +@@ -2180,8 +2180,9 @@ InternalHiiIfrValueAction ( + } + + StringPtr = ConfigAltResp; +- +- while (StringPtr != L'\0') { ++ ASSERT (StringPtr != NULL); ++ ++ while (*StringPtr != L'\0') { + // + // 1. Find GUID=...&NAME=...&PATH=... + // +-- +1.9.1 + -- cgit 1.2.3-korg