d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In usr.sbin/pkg_install/updating/main.c, use the size of the destination

Browse Source 
buffer as size argument to strlcpy(), not the length of the source.

MFC after:	1 week
This commit is contained in:
Dimitry Andric 2011-12-17 23:35:46 +00:00
parent 6530d2f2d5
commit 9a3df8edd1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=228670
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/pkg_install/updating/main.c
View File

@ -141,7 +141,7 @@ main(int argc, char *argv[])
strcmp(pkgdbdir->d_name, "..") != 0) {
/* Create path to +CONTENTS file for each installed port */
n = strlcpy(tmp_file, pkgdbpath, strlen(pkgdbpath)+1);
n = strlcpy(tmp_file, pkgdbpath, sizeof(tmp_file));
n = strlcpy(tmp_file + n, "/", sizeof(tmp_file) - n);
n = strlcat(tmp_file + n, pkgdbdir->d_name,
sizeof(tmp_file) - n);
@ -181,7 +181,7 @@ main(int argc, char *argv[])
(void)exit(EXIT_FAILURE);
if (pname[strlen(pname) - 1] == '\n')
pname[strlen(pname) - 1] = '\0';
strlcpy (curr->name, pname, strlen(pname)+1);
strlcpy (curr->name, pname, sizeof(curr->name));
curr->next = head;
head = curr;
}