From 34b5f6140739c9a8e12816ad516eb4742202f3c3 Mon Sep 17 00:00:00 2001
From: eadler <eadler@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 19 Nov 2012 04:08:10 +0000
Subject: [PATCH] MFC r243081: 	Avoid possible null deref if ypclnt_new
 returns null

PR:		bin/172979
Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/8@243257 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 usr.bin/chpass/chpass.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 2504e68ec..9f9be5335 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -241,8 +241,11 @@ main(int argc, char *argv[])
 #ifdef YP
 	case _PWF_NIS:
 		ypclnt = ypclnt_new(yp_domain, "passwd.byname", yp_host);
-		if (ypclnt == NULL ||
-		    ypclnt_connect(ypclnt) == -1 ||
+		if (ypclnt == NULL) {
+			warnx("ypclnt_new failed");
+			exit(1);
+		}
+		if (ypclnt_connect(ypclnt) == -1 ||
 		    ypclnt_passwd(ypclnt, pw, password) == -1) {
 			warnx("%s", ypclnt->error);
 			ypclnt_free(ypclnt);
-- 
2.45.0