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

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

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

Modified: stable/8/usr.bin/chpass/chpass.c
==============================================================================
--- stable/8/usr.bin/chpass/chpass.c    Mon Nov 19 04:07:43 2012        
(r243256)
+++ stable/8/usr.bin/chpass/chpass.c    Mon Nov 19 04:08:10 2012        
(r243257)
@@ -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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to