summaryrefslogtreecommitdiff
path: root/lib/efi_selftest
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-03-21 13:07:42 -0400
committerTom Rini <trini@konsulko.com>2019-03-21 13:07:42 -0400
commitb94b19e729895285cd0c9ed170d20038173d4f07 (patch)
treeeaa8af4493f2ef06e58bd5ce6a6e50d64a8f0e29 /lib/efi_selftest
parent3d7891d3f3b67a0d150b38afccc0765bd19b0bd2 (diff)
parentd0bd87612f410a723d5ddb3001e805485e3efb4f (diff)
Merge tag 'efi-2019-04-rc5' of git://git.denx.de/u-boot-efi
Pull request for UEFI system for v2019.04-rc5 A bunch of small fixes. The major ones being - avoid illegal memory access in efi_allocate_pool() on 32 bit systems - avoid endless loop in HII protocol
Diffstat (limited to 'lib/efi_selftest')
-rw-r--r--lib/efi_selftest/efi_selftest_hii.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/lib/efi_selftest/efi_selftest_hii.c b/lib/efi_selftest/efi_selftest_hii.c
index 8a0b3bc3536..f4b70f79508 100644
--- a/lib/efi_selftest/efi_selftest_hii.c
+++ b/lib/efi_selftest/efi_selftest_hii.c
@@ -783,19 +783,10 @@ static int test_hii_string_get_string(void)
goto out;
}
-#if 1
- u16 *c1, *c2;
-
- for (c1 = string, c2 = L"Japanese"; *c1 == *c2; c1++, c2++)
- ;
- if (!*c1 && !*c2)
- result = EFI_ST_SUCCESS;
- else
- result = EFI_ST_FAILURE;
-#else
- /* TODO: %ls */
- efi_st_printf("got string is %s (can be wrong)\n", string);
-#endif
+ if (efi_st_strcmp_16_8(string, "Japanese")) {
+ efi_st_error("get_string returned incorrect string\n");
+ goto out;
+ }
result = EFI_ST_SUCCESS;