community/efivar: backport upstream fix for UCS2 logic

fixes #11523

3 files changed, 93 insertions, 3 deletions

diff --git a/community/efivar/APKBUILD b/community/efivar/APKBUILD
index f86e8ec751..510de1d2d8 100644
--- a/community/efivar/APKBUILD
+++ b/community/efivar/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Lucas Ramage <ramage.lucas@protonmail.com>
 pkgname=efivar
 pkgver=37
-pkgrel=1
+pkgrel=2
 pkgdesc="Tools and library to manipulate EFI variables"
 url="https://github.com/rhboot/efivar"
 arch="x86 x86_64 armhf armv7 aarch64 ppc64le"
@@ -15,7 +15,9 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="https://github.com/rhboot/efivar/releases/download/$pkgver/efivar-$pkgver.tar.bz2
         efivar-fix-format_guid.patch
         efivar-fix-packed.patch
-        musl-bswap.patch"
+        musl-bswap.patch
+        efivar-fix-ucs2.patch
+        "
 builddir="$srcdir/efivar-$pkgver"
 
 build() {
@@ -35,4 +37,5 @@ check() {
 sha512sums="305a82ed103c7e3d8f723934019d552677c73558768dd5341f87d0364f5c60824d24f5a8e1bf90075e825908085083d4ecdccec5ac757fd38ee6ac8fea28c3e4  efivar-37.tar.bz2
 78f8f1e41e088440802815fab1e1474b1c98a9362c7bac178ea5eb9c457ad3045e21f2ee700dc95b9e805339e976f0218b6faad663f2f99838ddfa85ce12bb14  efivar-fix-format_guid.patch
 0be6e0fe6f2619bcedaf97006afaeeca2d195a90636ecc73b598c3157abaf55bb956f67e6ab12f680c9c874e496ce2093ee2ba6940a170fd9fed0165bbbcca97  efivar-fix-packed.patch
-84fd5baf91df91889cfcfed2bcf59f073dc754f6aba1944059203bbe99f4bbb6dc92addff9fae8f687a2c95f9438b0eb301dd0320728a8a2a6edd5e2b2b5ba94  musl-bswap.patch"
+84fd5baf91df91889cfcfed2bcf59f073dc754f6aba1944059203bbe99f4bbb6dc92addff9fae8f687a2c95f9438b0eb301dd0320728a8a2a6edd5e2b2b5ba94  musl-bswap.patch
+4eb0459bbffe5a11ecaf004be0ec8589f7439629732fb07944390d7d354537e8318b7f3b6d0729672f12a7b927f0d2907fe5b517aa6f6e9cc1d64b525f3c79ce  efivar-fix-ucs2.patch"
diff --git a/community/efivar/efivar-fix-logic-that-checks-for-UCS-2-string-termination.patch b/community/efivar/efivar-fix-logic-that-checks-for-UCS-2-string-termination.patch
new file mode 100644
index 0000000000..176e3fd197
--- /dev/null
+++ b/community/efivar/efivar-fix-logic-that-checks-for-UCS-2-string-termination.patch
@@ -0,0 +1,28 @@
+From 4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Tue, 5 Mar 2019 17:23:32 +0100
+Subject: [PATCH] ucs2.h: fix logic that checks for UCS-2 string termination
+
+Currently the loop to count the lenght of the UCS-2 string ends if either
+of the two bytes are 0, but 0 is a valid value for UCS-2 character codes.
+
+So only break the loop when 0 is the value for both UCS-2 char bytes.
+
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+---
+ src/ucs2.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ucs2.h b/src/ucs2.h
+index e0390c3..fd8b056 100644
+--- a/src/ucs2.h
++++ b/src/ucs2.h
+@@ -29,7 +29,7 @@ ucs2len(const void *vs, ssize_t limit)
+        const uint8_t *s8 = vs;
+ 
+        for (i = 0;
+-            i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0;
++            i < (limit >= 0 ? limit : i+1) && !(s8[0] == 0 && s8[1] == 0);
+             i++, s8 += 2)
+                ;
+        return i;
diff --git a/community/efivar/efivar-fix-ucs2.patch b/community/efivar/efivar-fix-ucs2.patch
new file mode 100644
index 0000000000..594da617cd
--- /dev/null
+++ b/community/efivar/efivar-fix-ucs2.patch
@@ -0,0 +1,59 @@
+From fdb803402fb32fa6d020bac57a40c7efe4aabb7d Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Tue, 5 Mar 2019 17:23:24 +0100
+Subject: [PATCH] ucs2.h: remove unused variable
+
+The const uint16_t pointer is not used since now the two bytes of the
+UCS-2 chars are checked to know if is the termination of the string.
+
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+---
+ src/ucs2.h | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/ucs2.h b/src/ucs2.h
+index edd8367..e0390c3 100644
+--- a/src/ucs2.h
++++ b/src/ucs2.h
+@@ -26,12 +26,11 @@ static inline size_t UNUSED
+ ucs2len(const void *vs, ssize_t limit)
+ {
+        ssize_t i;
+-       const uint16_t *s = vs;
+        const uint8_t *s8 = vs;
+ 
+        for (i = 0;
+             i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0;
+-            i++, s8 += 2, s++)
++            i++, s8 += 2)
+                ;
+        return i;
+ }
+From 4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Tue, 5 Mar 2019 17:23:32 +0100
+Subject: [PATCH] ucs2.h: fix logic that checks for UCS-2 string termination
+
+Currently the loop to count the lenght of the UCS-2 string ends if either
+of the two bytes are 0, but 0 is a valid value for UCS-2 character codes.
+
+So only break the loop when 0 is the value for both UCS-2 char bytes.
+
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+---
+ src/ucs2.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ucs2.h b/src/ucs2.h
+index e0390c3..fd8b056 100644
+--- a/src/ucs2.h
++++ b/src/ucs2.h
+@@ -29,7 +29,7 @@ ucs2len(const void *vs, ssize_t limit)
+        const uint8_t *s8 = vs;
+ 
+        for (i = 0;
+-            i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0;
++            i < (limit >= 0 ? limit : i+1) && !(s8[0] == 0 && s8[1] == 0);
+             i++, s8 += 2)
+                ;
+        return i;