From: Apple <opensource@apple.com>
Date: Fri, 15 Apr 2005 18:31:40 +0000 (+0000)
Subject: CF-299.35.tar.gz
X-Git-Tag: mac-os-x-1039^0
X-Git-Url: https://git.saurik.com/apple/cf.git/commitdiff_plain/df7f3a2a3ea65443e9420245c8c2860a5aaa5a00

CF-299.35.tar.gz
---

diff --git a/Makefile b/Makefile
index d8bca03..1535edf 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 #	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
diff --git a/StringEncodings.subproj/CFUniChar.c b/StringEncodings.subproj/CFUniChar.c
index c891c0a..b092590 100644
--- a/StringEncodings.subproj/CFUniChar.c
+++ b/StringEncodings.subproj/CFUniChar.c
@@ -63,8 +63,8 @@
 #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) {
@@ -109,7 +109,7 @@ static bool __CFUniCharLoadFile(const char *bitmapName, const void **bytes) {
     char cpath[MAXPATHLEN];
 
     __CFUniCharCharacterSetPath(cpath);
-    strcat(cpath, bitmapName);
+    strlcat(cpath, bitmapName, MAXPATHLEN);
 
     return __CFUniCharLoadBytesFromFile(cpath, bytes);
 }