CF-299.35.tar.gz

diff --git a/Makefile b/Makefile
index d8bca0374ca4019ba8831b09a095f0e2710557e9..1535edf1a3a6f2e6e0573186ed8479006edf5351 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 #      OTHER_LFLAGS    other flags to be passed to the link stage
 #
 
 #      OTHER_LFLAGS    other flags to be passed to the link stage
 #
 

-CURRENT_PROJECT_VERSION = 299.33
+CURRENT_PROJECT_VERSION = 299.35

 
 # First figure out the platform if not specified, so we can use it in the
 # rest of this file.  Currently defined values: Darwin, Linux, FreeBSD, WIN32
 
 # First figure out the platform if not specified, so we can use it in the
 # rest of this file.  Currently defined values: Darwin, Linux, FreeBSD, WIN32

diff --git a/StringEncodings.subproj/CFUniChar.c b/StringEncodings.subproj/CFUniChar.c
index c891c0a80d235844b6c08a9fcd11efa0f6868065..b092590514bffabe996e08759631e00c98119981 100644 (file)
--- a/StringEncodings.subproj/CFUniChar.c
+++ b/StringEncodings.subproj/CFUniChar.c
@@ -63,8 +63,8 @@
 #if !defined(__MACOS8__)
 
 CF_INLINE void __CFUniCharCharacterSetPath(char *cpath) {
 #if !defined(__MACOS8__)
 
 CF_INLINE void __CFUniCharCharacterSetPath(char *cpath) {

-    strcpy(cpath, __kCFCharacterSetDir);
-    strcat(cpath, "/CharacterSets/");
+    strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN);
+    strlcat(cpath, "/CharacterSets/", MAXPATHLEN);

 }
 
 static bool __CFUniCharLoadBytesFromFile(const char *fileName, const void **bytes) {
 }
 
 static bool __CFUniCharLoadBytesFromFile(const char *fileName, const void **bytes) {


@@ -109,7 +109,7 @@ static bool __CFUniCharLoadFile(const char *bitmapName, const void **bytes) {
     char cpath[MAXPATHLEN];
 
     __CFUniCharCharacterSetPath(cpath);
     char cpath[MAXPATHLEN];
 
     __CFUniCharCharacterSetPath(cpath);

-    strcat(cpath, bitmapName);
+    strlcat(cpath, bitmapName, MAXPATHLEN);

 
     return __CFUniCharLoadBytesFromFile(cpath, bytes);
 }
 
     return __CFUniCharLoadBytesFromFile(cpath, bytes);
 }