irc: fix join of channels with name longer than 127 chars (closes #1717)

src/plugins/irc/irc-buffer.c

@@ -85,26 +85,38 @@ irc_buffer_get_server_and_channel (struct t_gui_buffer *buffer,
 
 /*
  * Builds buffer name with a server and a channel.
+ *
+ * Note: result must be freed after use.
  */
 
-const char *
+char *
 irc_buffer_build_name (const char *server, const char *channel)
 {
-    static char buffer[128];
+    char **buffer;
 
-    buffer[0] = '\0';
+    buffer = weechat_string_dyn_alloc (128);
 
     if (!server && !channel)
-        return buffer;
+        goto end;
 
     if (server && channel)
-        snprintf (buffer, sizeof (buffer), "%s.%s", server, channel);
+    {
+        weechat_string_dyn_concat (buffer, server, -1);
+        weechat_string_dyn_concat (buffer, ".", -1);
+        weechat_string_dyn_concat (buffer, channel, -1);
+    }
     else if (server)
-        snprintf (buffer, sizeof (buffer), "server.%s", server);
+    {
+        weechat_string_dyn_concat (buffer, "server.", -1);
+        weechat_string_dyn_concat (buffer, server, -1);
+    }
     else
-        snprintf (buffer, sizeof (buffer), "%s", channel);
+    {
+        weechat_string_dyn_concat (buffer, channel, -1);
+    }
 
-    return buffer;
+end:
+    return weechat_string_dyn_free (buffer, 0);
 }
 
 /*

src/plugins/irc/irc-buffer.h

@@ -46,8 +46,7 @@ struct t_irc_channel;
 extern void irc_buffer_get_server_and_channel (struct t_gui_buffer *buffer,
                                                struct t_irc_server **server,
                                                struct t_irc_channel **channel);
-extern const char *irc_buffer_build_name (const char *server,
-                                          const char *channel);
+extern char *irc_buffer_build_name (const char *server, const char *channel);
 extern int irc_buffer_close_cb (const void *pointer, void *data,
                                 struct t_gui_buffer *buffer);
 extern int irc_buffer_nickcmp_cb (const void *pointer, void *data,

src/plugins/irc/irc-channel.c

@@ -245,8 +245,8 @@ irc_channel_create_buffer (struct t_irc_server *server,
     struct t_gui_buffer *ptr_buffer, *ptr_buffer_for_merge;
     int buffer_created, current_buffer_number, buffer_position;
     int manual_join, noswitch;
-    char str_number[32], *channel_name_lower;
-    const char *buffer_name, *short_name, *localvar_channel;
+    char str_number[32], *channel_name_lower, *buffer_name;
+    const char *short_name, *localvar_channel;
 
     buffer_created = 0;
 
@@ -294,7 +294,7 @@ irc_channel_create_buffer (struct t_irc_server *server,
                                          &irc_input_data_cb, NULL, NULL,
                                          &irc_buffer_close_cb, NULL, NULL);
         if (!ptr_buffer)
-            return NULL;
+            goto end;
 
         if (weechat_buffer_get_integer (ptr_buffer, "layout_number") < 1)
         {
@@ -432,6 +432,9 @@ irc_channel_create_buffer (struct t_irc_server *server,
         }
     }
 
+end:
+    if (buffer_name)
+        free (buffer_name);
     return ptr_buffer;
 }
 

src/plugins/irc/irc-protocol.c

@@ -1896,8 +1896,7 @@ IRC_PROTOCOL_CALLBACK(nick)
 {
     struct t_irc_channel *ptr_channel;
     struct t_irc_nick *ptr_nick, *ptr_nick_found;
-    char *old_color, str_tags[512];
-    const char *buffer_name;
+    char *old_color, str_tags[512], *buffer_name;
     int local_nick, smart_filter;
     struct t_irc_channel_speaking *ptr_nick_speaking;
 
@@ -1969,6 +1968,8 @@ IRC_PROTOCOL_CALLBACK(nick)
                     weechat_buffer_set (ptr_channel->buffer,
                                         "localvar_set_channel",
                                         ptr_channel->name);
+                    if (buffer_name)
+                        free (buffer_name);
                 }
                 break;
             case IRC_CHANNEL_TYPE_CHANNEL:
@@ -6355,8 +6356,8 @@ IRC_PROTOCOL_CALLBACK(470)
 {
     struct t_gui_buffer *ptr_buffer;
     struct t_gui_lines *own_lines;
-    const char *buffer_name, *short_name, *localvar_channel;
-    char *old_channel_lower, *new_channel_lower;
+    const char *short_name, *localvar_channel;
+    char *old_channel_lower, *new_channel_lower, *buffer_name;
     int lines_count;
 
     irc_protocol_cb_generic_error (server, date, irc_message,
@@ -6386,6 +6387,8 @@ IRC_PROTOCOL_CALLBACK(470)
             buffer_name = irc_buffer_build_name (server->name, params[2]);
             weechat_buffer_set (ptr_buffer, "name", buffer_name);
             weechat_buffer_set (ptr_buffer, "localvar_set_channel", params[2]);
+            if (buffer_name)
+                free (buffer_name);
 
             /*
              * check if logger backlog should be displayed for the new channel

src/plugins/irc/irc-server.c

@@ -2302,7 +2302,8 @@ irc_server_rename (struct t_irc_server *server, const char *new_name)
 {
     int length;
     char *mask, *pos_option, *new_option_name, charset_modifier[256];
-    const char *buffer_name, *option_name;
+    char *buffer_name;
+    const char *option_name;
     struct t_infolist *infolist;
     struct t_config_option *ptr_option;
     struct t_irc_channel *ptr_channel;
@@ -2366,6 +2367,8 @@ irc_server_rename (struct t_irc_server *server, const char *new_name)
             weechat_buffer_set (ptr_channel->buffer, "name", buffer_name);
             weechat_buffer_set (ptr_channel->buffer, "localvar_set_server",
                                 server->name);
+            if (buffer_name)
+                free (buffer_name);
         }
     }
     if (server->buffer)
@@ -2381,6 +2384,8 @@ irc_server_rename (struct t_irc_server *server, const char *new_name)
                   "irc.%s", server->name);
         weechat_buffer_set (server->buffer, "localvar_set_charset_modifier",
                             charset_modifier);
+        if (buffer_name)
+            free (buffer_name);
     }
 
     return 1;