From 00893e79fc62966067af1a106567db96bd170338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 3 Mar 2024 19:11:32 +0100 Subject: New upstream version 1.2 --- lib/uniname/uniname.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'lib/uniname/uniname.c') diff --git a/lib/uniname/uniname.c b/lib/uniname/uniname.c index 000b00fe..28e2eb70 100644 --- a/lib/uniname/uniname.c +++ b/lib/uniname/uniname.c @@ -1,5 +1,5 @@ /* Association between Unicode characters and their names. - Copyright (C) 2000-2002, 2005-2007, 2009-2022 Free Software Foundation, Inc. + Copyright (C) 2000-2002, 2005-2007, 2009-2024 Free Software Foundation, Inc. This file is free software. It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". @@ -245,7 +245,7 @@ unicode_character_name (ucs4_t c, char *buf) unsigned int index3; const char *q; - /* buf needs to have at least 16 + 7 bytes here. */ + /* buf needs to have at least 16 + 7 + 1 bytes here. */ memcpy (buf, "HANGUL SYLLABLE ", 16); ptr = buf + 16; @@ -274,7 +274,7 @@ unicode_character_name (ucs4_t c, char *buf) char *ptr; int i; - /* buf needs to have at least 28 + 5 bytes here. */ + /* buf needs to have at least 28 + 5 + 1 bytes here. */ memcpy (buf, "CJK COMPATIBILITY IDEOGRAPH-", 28); ptr = buf + 28; @@ -291,8 +291,8 @@ unicode_character_name (ucs4_t c, char *buf) /* Special case for variation selectors. Keeps the tables small. */ - /* buf needs to have at least 19 + 3 bytes here. */ - sprintf (buf, "VARIATION SELECTOR-%d", + /* buf needs to have at least 19 + 3 + 1 bytes here. */ + sprintf (buf, "VARIATION SELECTOR-%u", c <= 0xFE0F ? c - 0xFE00 + 1 : c - 0xE0100 + 17); return buf; } @@ -339,7 +339,8 @@ unicode_character_name (ucs4_t c, char *buf) if (words != NULL) { /* Found it in unicode_index_to_name. Now concatenate the words. */ - /* buf needs to have at least UNICODE_CHARNAME_MAX_LENGTH bytes. */ + /* buf needs to have at least UNICODE_CHARNAME_MAX_LENGTH + 1 + bytes. */ char *ptr = buf; for (;;) { -- cgit v1.2.3