Changeset 8e9e2b7 for protocols/oscar

Timestamp:

2010-10-03T02:45:26Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

04f0c10

Parents:

88de0c9 (diff), 2af3e23 (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:

Merging mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

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);