Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Apr 2011 14:54:52 +0000 (UTC)
From:      Hajimu UMEMOTO <ume@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r220326 - stable/8/usr.bin/su
Message-ID:  <201104041454.p34EsqtZ086653@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ume
Date: Mon Apr  4 14:54:52 2011
New Revision: 220326
URL: http://svn.freebsd.org/changeset/base/220326

Log:
  MFC r220055: getlogin() may return NULL.

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

Modified: stable/8/usr.bin/su/su.c
==============================================================================
--- stable/8/usr.bin/su/su.c	Mon Apr  4 14:53:36 2011	(r220325)
+++ stable/8/usr.bin/su/su.c	Mon Apr  4 14:54:52 2011	(r220326)
@@ -153,7 +153,7 @@ int
 main(int argc, char *argv[])
 {
 	static char	*cleanenv;
-	struct passwd	*pwd;
+	struct passwd	*pwd = NULL;
 	struct pam_conv	conv = { openpam_ttyconv, NULL };
 	enum tristate	iscsh;
 	login_cap_t	*lc;
@@ -259,8 +259,9 @@ main(int argc, char *argv[])
 	/* get current login name, real uid and shell */
 	ruid = getuid();
 	username = getlogin();
-	pwd = getpwnam(username);
-	if (username == NULL || pwd == NULL || pwd->pw_uid != ruid)
+	if (username != NULL)
+		pwd = getpwnam(username);
+	if (pwd == NULL || pwd->pw_uid != ruid)
 		pwd = getpwuid(ruid);
 	if (pwd == NULL) {
 #ifdef USE_BSM_AUDIT



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104041454.p34EsqtZ086653>