From owner-p4-projects  Sun Feb 16  3:10:31 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5321537B401; Sun, 16 Feb 2003 03:10:29 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A6F7637B40B
	for <perforce@freebsd.org>; Sun, 16 Feb 2003 03:10:28 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 55A2043F3F
	for <perforce@freebsd.org>; Sun, 16 Feb 2003 03:10:28 -0800 (PST)
	(envelope-from des@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1GBASbv001317
	for <perforce@freebsd.org>; Sun, 16 Feb 2003 03:10:28 -0800 (PST)
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1GBAR3U001313
	for perforce@freebsd.org; Sun, 16 Feb 2003 03:10:27 -0800 (PST)
Date: Sun, 16 Feb 2003 03:10:27 -0800 (PST)
Message-Id: <200302161110.h1GBAR3U001313@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Subject: PERFORCE change 25271 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=25271

Change 25271 by des@des.at.des.thinksec.com on 2003/02/16 03:09:51

	Avoid a NULL pointer dereference if PAM_CONV is non-NULL but its
	conv member is NULL.

Affected files ...

.. //depot/projects/openpam/lib/pam_vprompt.c#9 edit

Differences ...

==== //depot/projects/openpam/lib/pam_vprompt.c#9 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_vprompt.c#8 $
+ * $P4: //depot/projects/openpam/lib/pam_vprompt.c#9 $
  */
 
 #include <stdarg.h>
@@ -66,7 +66,7 @@
 	r = pam_get_item(pamh, PAM_CONV, (const void **)&conv);
 	if (r != PAM_SUCCESS)
 		RETURNC(r);
-	if (conv == NULL) {
+	if (conv == NULL || conv->conv == NULL) {
 		openpam_log(PAM_LOG_ERROR, "no conversation function");
 		RETURNC(PAM_SYSTEM_ERR);
 	}

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message