Changeset f4396c4

Timestamp:

2015-12-06T00:43:14Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

c54bb11

Parents:

ed431c3

Message:

irc_send_names: refactor to use GString instead of the stack

Because modifying this code was making me REALLY uncomfortable.

This still only allocates memory once. Needing to extend the string
would be a bug in the length checks, but at least that's harmless now.

File:

• irc_send.c (modified) (2 diffs)

irc_send.c

@@ -202 +202 @@
 }
 
+#define IRC_NAMES_LEN 385
+
 void irc_send_names(irc_channel_t *ic)
 {
         GSList *l;
-        char namelist[385] = "";
+        GString *namelist = g_string_sized_new(IRC_NAMES_LEN);
 
         /* RFCs say there is no error reply allowed on NAMES, so when the
@@ -212 +214 @@
                 irc_channel_user_t *icu = l->data;
                 irc_user_t *iu = icu->iu;
-
-                if (strlen(namelist) + strlen(iu->nick) > sizeof(namelist) - 4) {
-                        irc_send_num(ic->irc, 353, "= %s :%s", ic->name, namelist);
-                        *namelist = 0;
-                }
-
-                namelist[strlen(namelist) + 1] = '\0';
-                namelist[strlen(namelist)] = irc_channel_user_get_prefix(icu);
-
-                strcat(namelist, iu->nick);
-                strcat(namelist, " ");
-        }
-
-        if (*namelist) {
-                irc_send_num(ic->irc, 353, "= %s :%s", ic->name, namelist);
+                size_t extra_len = strlen(iu->nick);
+                char prefix;
+
+                if (namelist->len + extra_len > IRC_NAMES_LEN - 4) {
+                        irc_send_num(ic->irc, 353, "= %s :%s", ic->name, namelist->str);
+                        g_string_truncate(namelist, 0);
+                }
+
+                if ((prefix = irc_channel_user_get_prefix(icu))) {
+                        g_string_append_c(namelist, prefix);
+                }
+
+                g_string_append(namelist, iu->nick);
+                g_string_append_c(namelist, ' ');
+        }
+
+        if (namelist->len) {
+                irc_send_num(ic->irc, 353, "= %s :%s", ic->name, namelist->str);
         }
 
         irc_send_num(ic->irc, 366, "%s :End of /NAMES list", ic->name);
+
+        g_string_free(namelist, TRUE);
 }