2006-04-27 Paolo Borelli (pborelli@katamail.com) reviewed by: plam

[fontconfig.git] / src / fcstr.c

diff --git a/src/fcstr.c b/src/fcstr.c
index b60c082b2be06bd2ea5c3a46db5e1b176425c7be..5d1961c3af47ee0f74857d6ed7df4e9cea976cfc 100644 (file)
--- a/src/fcstr.c
+++ b/src/fcstr.c
@@ -22,23 +22,25 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "fcint.h"
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-#include "fcint.h"
 
 FcChar8 *
 FcStrCopy (const FcChar8 *s)
 {
-    FcChar8    *r;
+    int     len;
+    FcChar8 *r;
 
     if (!s)
        return 0;
-    r = (FcChar8 *) malloc (strlen ((char *) s) + 1);
+    len = strlen ((char *) s) + 1;
+    r = (FcChar8 *) malloc (len);
     if (!r)
        return 0;
-    FcMemAlloc (FC_MEM_STRING, strlen ((char *) s) + 1);
-    strcpy ((char *) r, (char *) s);
+    FcMemAlloc (FC_MEM_STRING, len);
+    memcpy (r, s, len);
     return r;
 }
 
@@ -449,8 +451,7 @@ again:
        ++ s1;
        ++ s2;
     }
-
-    return 0;
+    /* never reached. */
 }
 
 int
@@ -707,7 +708,7 @@ FcStrBufChar (FcStrBuf *buf, FcChar8 c)
        }
        else
        {
-           size = buf->size + 1024;
+           size = buf->size + 64;
            new = malloc (size);
            if (new)
            {
@@ -781,7 +782,7 @@ FcStrCopyFilename (const FcChar8 *s)
        if (!new)
            return 0;
        FcMemAlloc (FC_MEM_STRING, size);
-       strcpy ((char *) new, (const char *) s);
+       memcpy (new, s, size);
     }
     return new;
 }