From owner-p4-projects@FreeBSD.ORG  Wed Jun 18 02:42:15 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D93E237B408; Wed, 18 Jun 2003 02:42:14 -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 15C7A37B40B
	for <perforce@freebsd.org>; Wed, 18 Jun 2003 02:42:14 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7023A43FBF
	for <perforce@freebsd.org>; Wed, 18 Jun 2003 02:42:13 -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 h5I9gD0U090691
	for <perforce@freebsd.org>; Wed, 18 Jun 2003 02:42:13 -0700 (PDT)
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5I9gCxp090685
	for perforce@freebsd.org; Wed, 18 Jun 2003 02:42:12 -0700 (PDT)
Date: Wed, 18 Jun 2003 02:42:12 -0700 (PDT)
Message-Id: <200306180942.h5I9gCxp090685@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 33323 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: Wed, 18 Jun 2003 09:42:16 -0000

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

Change 33323 by des@des.at.des.thinksec.com on 2003/06/18 02:41:27

	Avoid side effects in macro arguments (don't I ever learn?); also
	address some related style issues.
	
	Submitted by:	Dmitry V. Levin <ldv@altlinux.org>

Affected files ...

.. //depot/projects/openpam/lib/openpam_load.c#20 edit
.. //depot/projects/openpam/lib/pam_end.c#14 edit
.. //depot/projects/openpam/lib/pam_getenvlist.c#13 edit

Differences ...

==== //depot/projects/openpam/lib/openpam_load.c#20 (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/openpam_load.c#19 $
+ * $P4: //depot/projects/openpam/lib/openpam_load.c#20 $
  */
 
 #include <dlfcn.h>
@@ -153,10 +153,13 @@
 		return;
 	openpam_destroy_chain(chain->next);
 	chain->next = NULL;
-	while (chain->optc--)
+	while (chain->optc) {
+		--chain->optc;
 		FREE(chain->optv[chain->optc]);
+	}
 	FREE(chain->optv);
 	openpam_release_module(chain->module);
+	chain->module = NULL;
 	FREE(chain);
 }
 

==== //depot/projects/openpam/lib/pam_end.c#14 (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_end.c#13 $
+ * $P4: //depot/projects/openpam/lib/pam_end.c#14 $
  */
 
 #include <stdlib.h>
@@ -68,8 +68,10 @@
 	}
 
 	/* clear environment */
-	while (pamh->env_count)
-		FREE(pamh->env[--pamh->env_count]);
+	while (pamh->env_count) {
+		--pamh->env_count;
+		FREE(pamh->env[pamh->env_count]);
+	}
 	FREE(pamh->env);
 
 	/* clear chains */

==== //depot/projects/openpam/lib/pam_getenvlist.c#13 (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_getenvlist.c#12 $
+ * $P4: //depot/projects/openpam/lib/pam_getenvlist.c#13 $
  */
 
 #include <stdlib.h>
@@ -65,8 +65,10 @@
 	}
 	for (i = 0; i < pamh->env_count; ++i) {
 		if ((envlist[i] = strdup(pamh->env[i])) == NULL) {
-			while (i)
-				FREE(envlist[--i]);
+			while (i) {
+				--i;
+				FREE(envlist[i]);
+			}
 			FREE(envlist);
 			openpam_log(PAM_LOG_ERROR, "%s",
 				pam_strerror(pamh, PAM_BUF_ERR));