librb: rb_snprinf_append: handle error return value from vsnprintf()

[solanum.git] / librb / src / tools.c

diff --git a/librb/src/tools.c b/librb/src/tools.c
index 17a9b45c8fb38cf29008be120d066ac0e5022547..05c7e3eb451f31257e7a4c3e27fd288386e5d4ae 100644 (file)
--- a/librb/src/tools.c
+++ b/librb/src/tools.c
@@ -83,7 +83,7 @@ rb_free_rb_dlink_node(rb_dlink_node *ptr)
  *   Changes a given buffer into an array of parameters.
  *   Taken from ircd-ratbox.
  *
- * inputs      - string to parse, array to put in
+ * inputs      - string to parse, array to put in (size >= maxpara)
  * outputs     - number of parameters
  */
 int
@@ -92,8 +92,6 @@ rb_string_to_array(char *string, char **parv, int maxpara)
        char *p, *xbuf = string;
        int x = 0;
 
-       parv[x] = NULL;
-
        if(string == NULL || string[0] == '\0')
                return x;
 
@@ -108,13 +106,11 @@ rb_string_to_array(char *string, char **parv, int maxpara)
                {
                        xbuf++;
                        parv[x++] = xbuf;
-                       parv[x] = NULL;
                        return x;
                }
                else
                {
                        parv[x++] = xbuf;
-                       parv[x] = NULL;
                        if((p = strchr(xbuf, ' ')) != NULL)
                        {
                                *p++ = '\0';
@@ -134,7 +130,6 @@ rb_string_to_array(char *string, char **parv, int maxpara)
                p++;
 
        parv[x++] = p;
-       parv[x] = NULL;
        return x;
 }
 
@@ -308,22 +303,25 @@ int
 rb_snprintf_append(char *str, size_t len, const char *format, ...)
 {
        if(len == 0)
-               return 0;
+               return -1;
 
-       size_t x = strlen(str);
+       int orig_len = strlen(str);
 
-       if(len < x)
+       if((int)len < orig_len)
        {
                str[len - 1] = '\0';
-               return (int)len - 1;
+               return len - 1;
        }
 
        va_list ap;
        va_start(ap, format);
-       int y = (vsnprintf(str + x, len - x, format, ap) + (int)x);
+       int append_len = vsnprintf(str + orig_len, len - orig_len, format, ap);
        va_end(ap);
 
-       return (y);
+       if (append_len < 0)
+               return append_len;
+
+       return (orig_len + append_len);
 }
 
 /* rb_basename