# HG changeset patch
# User Prabahar Jeyaram <Prabahar.Jeyaram@Sun.COM>
# Date 1250192040 25200
# Node ID a9e3d19877062c3451d9fd8cccef933005f35663
# Parent  0c33f1942e850a732cadd3e3827132e823346c56
6696858 zfs receive of incremental replication stream can dereference NULL pointer and crash (fix lint)

diff -r 0c33f1942e85 -r a9e3d1987706 usr/src/lib/libzfs/common/libzfs_sendrecv.c
--- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c	Thu Aug 13 13:20:41 2009 -0600
+++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c	Thu Aug 13 12:34:00 2009 -0700
@@ -1334,12 +1334,13 @@
 		VERIFY(0 == nvlist_lookup_uint64(stream_nvfs,
 		    "parentfromsnap", &stream_parent_fromsnap_guid));
 
+		s1 = strrchr(fsname, '/');
+		s2 = strrchr(stream_fsname, '/');
+
 		/* check for rename */
 		if ((stream_parent_fromsnap_guid != 0 &&
 		    stream_parent_fromsnap_guid != parent_fromsnap_guid) ||
-		    ((s1 = strrchr(fsname, '/')) &&
-		    (s2 = strrchr(stream_fsname, '/')) &&
-		    strcmp(s1, s2) != 0)) {
+		    ((s1 != NULL) && (s2 != NULL) && strcmp(s1, s2) != 0)) {
 			nvlist_t *parent;
 			char tryname[ZFS_MAXNAMELEN];