MFH

diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c
index e991d4cf3423e892b598c120843165d444023b81..81c23bd34b3f481a4a1391f0a60918a24b260cf9 100644 (file)
--- a/ext/fdf/fdf.c
+++ b/ext/fdf/fdf.c
@@ -1726,8 +1726,7 @@ PHP_FUNCTION(fdf_get_attachment) {
                RETURN_FALSE;
        }
 
-       strncpy(pathbuf , savepath, MAXPATHLEN-1);
-       pathbuf[MAXPATHLEN-1] = '\0';
+       strlcpy(pathbuf, savepath, sizeof(pathbuf));
 
        if(0 == stat(pathbuf, &statBuf)) {
                is_dir = S_ISDIR(statBuf.st_mode);

diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c
index c4a4ebaf24477525200818e2a04076b6f7e54c0c..7760efe094bdb9b159a82e34f9c7e961ecbe9161 100644 (file)
--- a/ext/mime_magic/mime_magic.c
+++ b/ext/mime_magic/mime_magic.c
@@ -730,9 +730,7 @@ static int parse(char *l, int lineno)
                return -1;
        }
        
-       strncpy(m->desc, l, sizeof(m->desc) - 1);
-       m->desc[sizeof(m->desc) - 1] = '\0';
-
+       strlcpy(m->desc, l, sizeof(m->desc));
     return 0;
 }