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
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.
9 So only break the loop when 0 is the value for both UCS-2 char bytes.
11 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
14 1 file changed, 1 insertion(+), 1 deletion(-)
16 diff --git a/src/ucs2.h b/src/ucs2.h
17 index e0390c3..fd8b056 100644
20 @@ -29,7 +29,7 @@ ucs2len(const void *vs, ssize_t limit)
21 const uint8_t *s8 = vs;
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);