From owner-svn-src-stable@FreeBSD.ORG  Mon Nov 19 04:08:20 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8292D43A;
 Mon, 19 Nov 2012 04:08:20 +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 674158FC12;
 Mon, 19 Nov 2012 04:08:20 +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 qAJ48K5I078124;
 Mon, 19 Nov 2012 04:08:20 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAJ48KrU078123;
 Mon, 19 Nov 2012 04:08:20 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211190408.qAJ48KrU078123@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 19 Nov 2012 04:08:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r243258 - stable/7/usr.bin/chpass
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Nov 2012 04:08:20 -0000

Author: eadler
Date: Mon Nov 19 04:08:20 2012
New Revision: 243258
URL: http://svnweb.freebsd.org/changeset/base/243258

Log:
  MFC r243081:
  	Avoid possible null deref if ypclnt_new returns null
  
  PR:		bin/172979
  Approved by:	cperciva (implicit)

Modified:
  stable/7/usr.bin/chpass/chpass.c
Directory Properties:
  stable/7/usr.bin/chpass/   (props changed)

Modified: stable/7/usr.bin/chpass/chpass.c
==============================================================================
--- stable/7/usr.bin/chpass/chpass.c	Mon Nov 19 04:08:10 2012	(r243257)
+++ stable/7/usr.bin/chpass/chpass.c	Mon Nov 19 04:08:20 2012	(r243258)
@@ -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);