[Gaim-commits] SF.net SVN: gaim: [18002] trunk/libgaim/protocols/oscar

[<the...@us...>]

Revision: 18002
          http://svn.sourceforge.net/gaim/?rev=18002&view=rev
Author:   thekingant
Date:     2006-12-14 18:42:07 -0800 (Thu, 14 Dec 2006)

Log Message:
-----------
Two parameters being passed to strncpy() were backwards

Modified Paths:
--------------
    trunk/libgaim/protocols/oscar/libaim.c
    trunk/libgaim/protocols/oscar/oscar.c

Modified: trunk/libgaim/protocols/oscar/libaim.c
===================================================================
--- trunk/libgaim/protocols/oscar/libaim.c	2006-12-15 02:40:27 UTC (rev 18001)
+++ trunk/libgaim/protocols/oscar/libaim.c	2006-12-15 02:42:07 UTC (rev 18002)
@@ -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 */

Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c	2006-12-15 02:40:27 UTC (rev 18001)
+++ trunk/libgaim/protocols/oscar/oscar.c	2006-12-15 02:42:07 UTC (rev 18002)
@@ -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,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.