From owner-svn-src-head@FreeBSD.ORG  Thu Nov 15 15:06:18 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id CE6FF74B;
 Thu, 15 Nov 2012 15:06:18 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 86C188FC13;
 Thu, 15 Nov 2012 15:06:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFF6IBA004079;
 Thu, 15 Nov 2012 15:06:18 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFF6IBk004078;
 Thu, 15 Nov 2012 15:06:18 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211151506.qAFF6IBk004078@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 15 Nov 2012 15:06:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243081 - head/usr.bin/chpass
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Nov 2012 15:06:18 -0000

Author: eadler
Date: Thu Nov 15 15:06:18 2012
New Revision: 243081
URL: http://svnweb.freebsd.org/changeset/base/243081

Log:
  Avoid possible null deref if ypclnt_new returns null
  
  PR:		bin/172979
  Submitted by:	Erik Cederstrand <erik@cederstrand.dk>
  Approved by:	cperciva
  MFC after:	3 days

Modified:
  head/usr.bin/chpass/chpass.c

Modified: head/usr.bin/chpass/chpass.c
==============================================================================
--- head/usr.bin/chpass/chpass.c	Thu Nov 15 15:06:15 2012	(r243080)
+++ head/usr.bin/chpass/chpass.c	Thu Nov 15 15:06:18 2012	(r243081)
@@ -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);