Mercurial > pidgin.yaz
changeset 15213:fcb3c61848e0
[gaim-migrate @ 18002]
Two parameters being passed to strncpy() were backwards
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Fri, 15 Dec 2006 02:42:07 +0000 |
| parents | 49afc9ce69d2 |
| children | bfc90a066604 |
| files | libgaim/protocols/oscar/libaim.c libgaim/protocols/oscar/oscar.c |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libgaim/protocols/oscar/libaim.c Fri Dec 15 02:40:27 2006 +0000 +++ b/libgaim/protocols/oscar/libaim.c Fri Dec 15 02:42:07 2006 +0000 @@ -31,6 +31,7 @@ OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE, NULL, /* user_splits */ NULL, /* protocol_options */ + /* The mimimum icon size below is not needed in AIM 6.0 */ {"gif,jpeg,bmp,ico", 48, 48, 50, 50, GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */ oscar_list_icon_aim, /* list_icon */
--- a/libgaim/protocols/oscar/oscar.c Fri Dec 15 02:40:27 2006 +0000 +++ b/libgaim/protocols/oscar/oscar.c Fri Dec 15 02:42:07 2006 +0000 @@ -430,7 +430,7 @@ char *str, *salvage; str = g_malloc(datalen + 1); - strncpy(str, datalen, data); + strncpy(str, data, datalen); str[datalen] = '\0'; salvage = gaim_utf8_salvage(str); ret = g_strdup_printf("%s %s", salvage,