jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-03 14:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

(pw_copy): Handle the case of a malformed line in master.passwd

Browse Source 
(copy it silently, do not dereference NULL pointer).

PR:             bin/102848
Reviewed by:    security-officer (cperciva)
MFC after:      1 week
This commit is contained in:
Thomas Quinot 2006-09-04 15:09:21 +00:00
parent 592777f6b6
commit 71219ddbd1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=161997
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libutil/pw_util.c
View File

@ -481,13 +481,22 @@ pw_copy(int ffd, int tfd, const struct passwd *pw, struct passwd *old_pw)
}
/* is it the one we're looking for? */
t = *q;
*q = '\0';
fpw = pw_scan(r, PWSCAN_MASTER);
/*
* fpw is either the struct password for the current line,
* or NULL if the line is malformed.
*/
*q = t;
if (strcmp(fpw->pw_name, pw->pw_name) != 0) {
if (fpw == NULL || strcmp(fpw->pw_name, pw->pw_name) != 0) {
/* nope */
free(fpw);
if (fpw != NULL)
free(fpw);
if (write(tfd, p, q - p + 1) != q - p + 1)
goto err;
++q;