Changeset 975708a for protocols/oscar/ssi.c

Timestamp:

2010-09-05T12:08:12Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2c6b0f4

Parents:

4e1be76 (diff), ed320e8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline merge.

File:

• protocols/oscar/ssi.c (modified) (1 diff)

protocols/oscar/ssi.c

@@ -415 +415 @@
                 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);