Date: Sat, 24 May 2003 10:47:18 -0700 (PDT) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 31793 for review Message-ID: <200305241747.h4OHlIZp087904@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305241747.h4OHlIZp087904>