svn commit: r278156 - in stable/9/contrib/amd: amd hlfsd

[Pedro F. Giffuni]

Author: pfg
Date: Tue Feb  3 14:37:38 2015
New Revision: 278156
URL: https://svnweb.freebsd.org/changeset/base/278156

Log:
  MFV	r277814, r277868, r277869:
  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

Modified:
  stable/9/contrib/amd/amd/amfs_generic.c
  stable/9/contrib/amd/hlfsd/homedir.c
Directory Properties:
  stable/9/contrib/amd/   (props changed)

Modified: stable/9/contrib/amd/amd/amfs_generic.c
==============================================================================
--- stable/9/contrib/amd/amd/amfs_generic.c	Tue Feb  3 14:36:48 2015	(r278155)
+++ stable/9/contrib/amd/amd/amfs_generic.c	Tue Feb  3 14:37:38 2015	(r278156)
@@ -1113,7 +1113,7 @@ amfs_generic_mount_child(am_node *new_mp
     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)

Modified: stable/9/contrib/amd/hlfsd/homedir.c
==============================================================================
--- stable/9/contrib/amd/hlfsd/homedir.c	Tue Feb  3 14:36:48 2015	(r278155)
+++ stable/9/contrib/amd/hlfsd/homedir.c	Tue Feb  3 14:37:38 2015	(r278156)
@@ -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 */