diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-02 19:45:26 -0700 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-02 19:45:26 -0700 |
| commit | 8e9e2b7d9e54744cee32b3724391bf0ad04e8aff (patch) | |
| tree | 6cafdc57bb8143306daf8ef8288d09754f39b451 /protocols/oscar/ssi.c | |
| parent | 88de0c96136313e553113f69cfc6ae544a5f5954 (diff) | |
| parent | 2af3e232ff468b288dd4e0dbdab1a17312d801c5 (diff) | |
Merging mainline, which includes a huge msnp13 merge.
Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.
Diffstat (limited to 'protocols/oscar/ssi.c')
| -rw-r--r-- | protocols/oscar/ssi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/protocols/oscar/ssi.c b/protocols/oscar/ssi.c index 76b5b427..f37d98e5 100644 --- a/protocols/oscar/ssi.c +++ b/protocols/oscar/ssi.c @@ -414,7 +414,7 @@ int aim_ssi_cleanlist(aim_session_t *sess, aim_conn_t *conn) for (parentgroup=sess->ssi.items; ((parentgroup) && (parentgroup->type!=AIM_SSI_TYPE_GROUP) && (parentgroup->gid==0x0000)); parentgroup=parentgroup->next); if (!parentgroup) { char *newgroup; - newgroup = (char*)g_malloc(strlen("Unknown")*sizeof(char)); + newgroup = (char*)g_malloc(strlen("Unknown")+1); strcpy(newgroup, "Unknown"); aim_ssi_addgroups(sess, conn, &newgroup, 1); } |