Changeset b6a3fbf

Timestamp:

2015-08-27T07:25:07Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

aa3b61e

Parents:

3c23681

Message:

irc_channel_name_gen: handle g_convert_with_fallback failures

First fallback to ASCII without TRANSLIT, and if that fails too, just
give up by returning NULL.

Basically the same thing as 3a27896 (a netbsd specific fix), but for
channel names. This wasn't needed before because the older version of
this code caught the NULL from the ASCIITRANSLIT attempt and gave up
immediately, while the refactored version lacked null checking.

File:

• irc_channel.c (modified) (1 diff)

irc_channel.c

@@ -593 +593 @@
 
         translit_name = g_convert_with_fallback(hint, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, &bytes_written, NULL);
+
+        if (!translit_name) {
+                /* Same thing as in nick_gen() in nick.c, try again without //TRANSLIT */
+                translit_name = g_convert_with_fallback(hint, -1, "ASCII", "UTF-8", "", NULL, &bytes_written, NULL);
+        }
+
+        if (!translit_name) {
+                return NULL;
+        }
+
         if (bytes_written > MAX_NICK_LENGTH) {
                 translit_name[MAX_NICK_LENGTH] = '\0';