From: Antony Dovgal <tony2001@php.net>
Date: Thu, 28 Dec 2006 20:45:27 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.2.1RC2~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5f95ec3e4dfaab75be9537feae226ef33e021a6;p=php

MFH
---

diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c
index e991d4cf34..81c23bd34b 100644
--- 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 c4a4ebaf24..7760efe094 100644
--- 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;
 }