Enlightenment CVS committal
Author : cedric
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
eet_data.c eet_lib.c
Log Message:
Remove all use of strcpy as we already know the length.
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- eet_data.c 16 May 2008 09:59:16 -0000 1.80
+++ eet_data.c 19 May 2008 15:25:46 -0000 1.81
@@ -417,7 +417,7 @@
len = strlen(s);
d = malloc(len + 1);
if (!d) return NULL;
- strcpy(d, s);
+ memcpy(d, s, len + 1);
*size_ret = len + 1;
return d;
}
@@ -526,7 +526,7 @@
len = strlen(buf);
d = malloc(len + 1);
if (!d) return NULL;
- strcpy(d, buf);
+ memcpy(d, buf, len + 1);
*size_ret = len + 1;
return d;
}
@@ -589,7 +589,7 @@
len = strlen(buf);
d = malloc(len + 1);
if (!d) return NULL;
- strcpy(d, buf);
+ memcpy(d, buf, len + 1);
*size_ret = len + 1;
return d;
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- eet_lib.c 19 May 2008 15:23:41 -0000 1.105
+++ eet_lib.c 19 May 2008 15:25:46 -0000 1.106
@@ -1134,6 +1134,7 @@
{
FILE *fp;
Eet_File *ef;
+ int file_len;
struct stat file_stat;
if (!file)
@@ -1214,8 +1215,10 @@
return ef;
}
+ file_len = strlen(file) + 1;
+
/* Allocate struct for eet file and have it zero'd out */
- ef = malloc(sizeof(Eet_File) + strlen(file) + 1);
+ ef = malloc(sizeof(Eet_File) + file_len);
if (!ef)
return NULL;
@@ -1223,7 +1226,7 @@
ef->fp = fp;
ef->readfp = NULL;
ef->path = ((char *)ef) + sizeof(Eet_File);
- strcpy(ef->path, file);
+ memcpy(ef->path, file, file_len);
ef->magic = EET_MAGIC_FILE;
ef->references = 1;
ef->mode = mode;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
