Changes in irc_im.c [5ebff60:b95d03b]

File:

• irc_im.c (modified) (6 diffs)

irc_im.c

@@ -235 +235 @@
                         } else {
                                 /* Modules can swallow messages. */
-                                return TRUE;
+                                goto cleanup;
                         }
                 }
@@ -250 +250 @@
         wrapped = word_wrap(msg, 425);
         irc_send_msg(iu, "PRIVMSG", dst, wrapped, prefix);
-
         g_free(wrapped);
+
+cleanup:
         g_free(prefix);
         g_free(msg);
@@ -291 +292 @@
 
         irc_send_msg((irc_user_t *) bu->ui_data, "NOTICE", irc->user->nick, msg->str, NULL);
+
+        g_string_free(msg, TRUE);
 
         return TRUE;
@@ -695 +698 @@
         irc_t *irc = bee->ui_data;
         irc_channel_t *ic = c->ui_data, *oic;
-        char stripped[MAX_NICK_LENGTH + 1], *full_name;
+        char *stripped, *full_name;
+        gsize bytes_written;
 
         if (ic == NULL) {
@@ -706 +710 @@
         }
 
-        strncpy(stripped, name, MAX_NICK_LENGTH);
-        stripped[MAX_NICK_LENGTH] = '\0';
+        stripped = g_convert_with_fallback(name, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, &bytes_written, NULL);
+        if (bytes_written > MAX_NICK_LENGTH) {
+                stripped[MAX_NICK_LENGTH] = '\0';
+        }
+
         irc_channel_name_strip(stripped);
         if (set_getbool(&bee->set, "lcnicks")) {
@@ -714 +721 @@
 
         if (stripped[0] == '\0') {
+                g_free(stripped);
                 return FALSE;
         }
 
         full_name = g_strdup_printf("#%s", stripped);
+        g_free(stripped);
         if ((oic = irc_channel_by_name(irc, full_name))) {
                 char *type, *chat_type;