gaim/gaim

Fix a potential crash substituting AIM away message strings.
oldstatus
2005-08-11, Mark Doliner
784a833ce765
Parents 68d0483601b7
Children a4c6e4969dde
Fix a potential crash substituting AIM away message strings.
1 files changed, 11 insertions(+), 16 deletions(-)
  • +11 -16
    src/util.c
    • --- a/src/util.c Thu Aug 11 16:45:16 2005 -0400
    +++ b/src/util.c Thu Aug 11 20:53:33 2005 -0400
    @@ -2141,8 +2141,7 @@
    gaim_str_sub_away_formatters(const char *str, const char *name)
    {
    char *c;
    - gchar *cpy;
    - int cnt = 0;
    + GString *cpy;
    time_t t;
    struct tm *tme;
    char tmp[20];
    @@ -2150,12 +2149,12 @@
    g_return_val_if_fail(str != NULL, NULL);
    g_return_val_if_fail(name != NULL, NULL);
    - cpy = g_malloc(BUF_LONG);
    + /* Create an empty GString that is hopefully big enough for most messages */
    + cpy = g_string_sized_new(1024);
    t = time(NULL);
    tme = localtime(&t);
    - cpy[0] = '\0';
    c = (char *)str;
    while (*c) {
    switch (*c) {
    @@ -2164,39 +2163,35 @@
    switch (*(c + 1)) {
    case 'n':
    /* append name */
    - strcpy(cpy + cnt, name);
    - cnt += strlen(name);
    + g_string_append(cpy, name);
    c++;
    break;
    case 'd':
    /* append date */
    strftime(tmp, 20, "%m/%d/%Y", tme);
    - strcpy(cpy + cnt, tmp);
    - cnt += strlen(tmp);
    + g_string_append(cpy, tmp);
    c++;
    break;
    case 't':
    /* append time */
    strftime(tmp, 20, "%I:%M:%S %p", tme);
    - strcpy(cpy + cnt, tmp);
    - cnt += strlen(tmp);
    + g_string_append(cpy, tmp);
    c++;
    break;
    default:
    - cpy[cnt++] = *c;
    + g_string_append_c(cpy, *c);
    }
    } else {
    - cpy[cnt++] = *c;
    + g_string_append_c(cpy, *c);
    }
    break;
    default:
    - cpy[cnt++] = *c;
    + g_string_append_c(cpy, *c);
    }
    c++;
    }
    - cpy[cnt] = '\0';
    -
    - return cpy;
    +
    + return g_string_free(cpy, FALSE);
    }
    gchar *