This commit is contained in:
Antony Dovgal 2006-12-28 20:45:27 +00:00
parent 559ab4b3f9
commit e5f95ec3e4
2 changed files with 2 additions and 5 deletions

View file

@ -1726,8 +1726,7 @@ PHP_FUNCTION(fdf_get_attachment) {
RETURN_FALSE; RETURN_FALSE;
} }
strncpy(pathbuf , savepath, MAXPATHLEN-1); strlcpy(pathbuf, savepath, sizeof(pathbuf));
pathbuf[MAXPATHLEN-1] = '\0';
if(0 == stat(pathbuf, &statBuf)) { if(0 == stat(pathbuf, &statBuf)) {
is_dir = S_ISDIR(statBuf.st_mode); is_dir = S_ISDIR(statBuf.st_mode);

View file

@ -730,9 +730,7 @@ static int parse(char *l, int lineno)
return -1; return -1;
} }
strncpy(m->desc, l, sizeof(m->desc) - 1); strlcpy(m->desc, l, sizeof(m->desc));
m->desc[sizeof(m->desc) - 1] = '\0';
return 0; return 0;
} }