From owner-p4-projects@FreeBSD.ORG  Thu May  1 08:57:21 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4AB0D37B404; Thu,  1 May 2003 08:57:21 -0700 (PDT)
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 A675837B401
	for <perforce@freebsd.org>; Thu,  1 May 2003 08:57:20 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 50A3D43F75
	for <perforce@freebsd.org>; Thu,  1 May 2003 08:57:20 -0700 (PDT)
	(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 h41FvK0U066961
	for <perforce@freebsd.org>; Thu, 1 May 2003 08:57:20 -0700 (PDT)
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41FvJ4B066958
	for perforce@freebsd.org; Thu, 1 May 2003 08:57:19 -0700 (PDT)
Date: Thu, 1 May 2003 08:57:19 -0700 (PDT)
Message-Id: <200305011557.h41FvJ4B066958@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>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 30310 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 May 2003 15:57:22 -0000

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

Change 30310 by des@des.at.des.thinksec.com on 2003/05/01 08:57:17

	Variable initialization issues.

Affected files ...

.. //depot/projects/openpam/lib/pam_set_item.c#18 edit

Differences ...

==== //depot/projects/openpam/lib/pam_set_item.c#18 (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_set_item.c#17 $
+ * $P4: //depot/projects/openpam/lib/pam_set_item.c#18 $
  */
 
 #include <sys/param.h>
@@ -62,6 +62,7 @@
 	if (pamh == NULL)
 		RETURNC(PAM_SYSTEM_ERR);
 	slot = &pamh->item[item_type];
+	osize = nsize = 0;
 	switch (item_type) {
 	case PAM_SERVICE:
 	case PAM_USER:
@@ -73,10 +74,10 @@
 	case PAM_USER_PROMPT:
 	case PAM_AUTHTOK_PROMPT:
 	case PAM_OLDAUTHTOK_PROMPT:
+		if (*slot != NULL)
+			osize = strlen(*slot) + 1;
 		if (item != NULL)
 			nsize = strlen(item) + 1;
-		if (*slot != NULL)
-			osize = strlen(*slot) + 1;
 		break;
 	case PAM_REPOSITORY:
 		osize = nsize = sizeof(struct pam_repository);