From owner-p4-projects@FreeBSD.ORG  Sat May 24 10:47:20 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C3D5137B404; Sat, 24 May 2003 10:47:19 -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 6215937B407
	for <perforce@freebsd.org>; Sat, 24 May 2003 10:47:19 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 076AE43F3F
	for <perforce@freebsd.org>; Sat, 24 May 2003 10:47:19 -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 h4OHlI0U087907
	for <perforce@freebsd.org>; Sat, 24 May 2003 10:47:18 -0700 (PDT)
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4OHlIZp087904
	for perforce@freebsd.org; Sat, 24 May 2003 10:47:18 -0700 (PDT)
Date: Sat, 24 May 2003 10:47:18 -0700 (PDT)
Message-Id: <200305241747.h4OHlIZp087904@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 31793 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: Sat, 24 May 2003 17:47:20 -0000

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

Change 31793 by des@des.at.des.thinksec.com on 2003/05/24 10:47:00

	Two more cases of asprintf(3) replacing malloc(3) + sprintf(3).

Affected files ...

.. //depot/projects/openpam/lib/openpam_set_option.c#11 edit
.. //depot/projects/openpam/lib/pam_setenv.c#10 edit

Differences ...

==== //depot/projects/openpam/lib/openpam_set_option.c#11 (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_set_option.c#10 $
+ * $P4: //depot/projects/openpam/lib/openpam_set_option.c#11 $
  */
 
 #include <sys/param.h>
@@ -82,9 +82,8 @@
 		cur->optv[i] = NULL;
 		RETURNC(PAM_SUCCESS);
 	}
-	if ((opt = malloc(len + strlen(value) + 2)) == NULL)
+	if (asprintf(&opt, "%.*s=%s", (int)len, option, value) < 0)
 		RETURNC(PAM_BUF_ERR);
-	sprintf(opt, "%.*s=%s", (int)len, option, value);
 	if (i == cur->optc) {
 		/* add */
 		optv = realloc(cur->optv, sizeof(char *) * (cur->optc + 2));

==== //depot/projects/openpam/lib/pam_setenv.c#10 (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_setenv.c#9 $
+ * $P4: //depot/projects/openpam/lib/pam_setenv.c#10 $
  */
 
 #include <stdlib.h>
@@ -71,9 +71,8 @@
 		RETURNC(PAM_SUCCESS);
 
 	/* set it... */
-	if ((env = malloc(strlen(name) + strlen(value) + 2)) == NULL)
+	if (asprintf(&env, "%s=%s", name, value) < 0)
 		RETURNC(PAM_BUF_ERR);
-	sprintf(env, "%s=%s", name, value);
 	r = pam_putenv(pamh, env);
 	FREE(env);
 	RETURNC(r);