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

MFV r277814, r277868, r277869:

Browse Source 
amd: Add extra check for NULL before deref.

MFV	r277841:
Fix a clang 3.6.0 warning (from dim)

CID:		274421
Obtained from:	NetBSD
MFC after:	4 days
This commit is contained in:
Pedro F. Giffuni 2015-02-03 14:36:48 +00:00
parent 12a7b18afa
commit 2a2e2dc91b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/10/; revision=278155
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/amd/amd/amfs_generic.c
View File

@ -1113,7 +1113,7 @@ amfs_generic_mount_child(am_node *new_mp, int *error_return)
new_mp->am_transp = (SVCXPRT *) xmalloc(sizeof(SVCXPRT));
*(new_mp->am_transp) = *current_transp;
}
if (error && (new_mp->am_mnt->mf_ops == &amfs_error_ops))
if (error && new_mp->am_mnt && (new_mp->am_mnt->mf_ops == &amfs_error_ops))
new_mp->am_error = error;
if (new_mp->am_error > 0)

2
contrib/amd/hlfsd/homedir.c
View File

@ -494,7 +494,7 @@ readent:
buf[0] = '\0';
fgets(buf, 256, passwd_fp);
passwd_line++;
if (!buf || buf[0] == '\0')
if (buf[0] == '\0')
goto readent;
/* read user name */