[Gaim-commits] CVS: gaim/src/win32 win32dep.c,1.44,1.45

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18302/src/win32

Modified Files:
	win32dep.c 
Log Message:
(19:15:38) datallah: LSchiere: here is that BSS overflow patch


Index: win32dep.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/win32dep.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -p -r1.44 -r1.45
--- win32dep.c	30 May 2004 21:58:42 -0000	1.44
+++ win32dep.c	30 Aug 2004 23:13:28 -0000	1.45
@@ -395,13 +395,13 @@ char* wgaim_install_dir(void) {
 
 char* wgaim_lib_dir(void) {
 	strcpy(lib_dir, wgaim_install_dir());
-	strcat(lib_dir, G_DIR_SEPARATOR_S "plugins");
+	g_strlcat(lib_dir, G_DIR_SEPARATOR_S "plugins", sizeof(lib_dir));
 	return (char*)&lib_dir;
 }
 
 char* wgaim_locale_dir(void) {
 	strcpy(locale_dir, wgaim_install_dir());
-	strcat(locale_dir, G_DIR_SEPARATOR_S "locale");
+	g_strlcat(locale_dir, G_DIR_SEPARATOR_S "locale", sizeof(locale_dir));
 	return (char*)&locale_dir;
 }
 
@@ -594,7 +594,7 @@ void wgaim_init(HINSTANCE hint) {
                 move_settings_dir();
         }
         else {
-                strcpy(app_data_dir, newenv);
+                g_strlcpy(app_data_dir, newenv, sizeof(app_data_dir));
         }
         gaim_debug(GAIM_DEBUG_INFO, "wgaim", "Gaim settings dir: %s\n", app_data_dir);