diff options
-rw-r--r-- | main/efivar/efivar-fix-logic-that-checks-for-UCS-2-string-termination.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/main/efivar/efivar-fix-logic-that-checks-for-UCS-2-string-termination.patch b/main/efivar/efivar-fix-logic-that-checks-for-UCS-2-string-termination.patch deleted file mode 100644 index 176e3fd197..0000000000 --- a/main/efivar/efivar-fix-logic-that-checks-for-UCS-2-string-termination.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e Mon Sep 17 00:00:00 2001 | ||
2 | From: Javier Martinez Canillas <javierm@redhat.com> | ||
3 | Date: Tue, 5 Mar 2019 17:23:32 +0100 | ||
4 | Subject: [PATCH] ucs2.h: fix logic that checks for UCS-2 string termination | ||
5 | |||
6 | Currently the loop to count the lenght of the UCS-2 string ends if either | ||
7 | of the two bytes are 0, but 0 is a valid value for UCS-2 character codes. | ||
8 | |||
9 | So only break the loop when 0 is the value for both UCS-2 char bytes. | ||
10 | |||
11 | Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> | ||
12 | --- | ||
13 | src/ucs2.h | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/ucs2.h b/src/ucs2.h | ||
17 | index e0390c3..fd8b056 100644 | ||
18 | --- a/src/ucs2.h | ||
19 | +++ b/src/ucs2.h | ||
20 | @@ -29,7 +29,7 @@ ucs2len(const void *vs, ssize_t limit) | ||
21 | const uint8_t *s8 = vs; | ||
22 | |||
23 | for (i = 0; | ||
24 | - i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0; | ||
25 | + i < (limit >= 0 ? limit : i+1) && !(s8[0] == 0 && s8[1] == 0); | ||
26 | i++, s8 += 2) | ||
27 | ; | ||
28 | return i; | ||