svn commit: r277869 - head/contrib/amd/amd

[Pedro F. Giffuni]

Author: pfg
Date: Thu Jan 29 01:28:39 2015
New Revision: 277869
URL: https://svnweb.freebsd.org/changeset/base/277869

Log:
  MFV	r277866
  amd: Add extra check for NULL before deref.
  
  CID:		274421
  Obtained from:	NetBSD
  MFC after:	4 days

Modified:
  head/contrib/amd/amd/amfs_generic.c
Directory Properties:
  head/contrib/amd/   (props changed)

Modified: head/contrib/amd/amd/amfs_generic.c
==============================================================================
--- head/contrib/amd/amd/amfs_generic.c	Thu Jan 29 01:26:23 2015	(r277868)
+++ head/contrib/amd/amd/amfs_generic.c	Thu Jan 29 01:28:39 2015	(r277869)
@@ -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)