Date: Sat, 9 May 2015 15:54:09 -0700 From: Garrett Cooper <yaneurabeya@gmail.com> To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r282685 - head/usr.sbin/pw Message-ID: <4DE758E7-BE6B-45D6-A184-9443FB21F4A7@gmail.com> In-Reply-To: <201505091912.t49JCHRf067749@svn.freebsd.org> References: <201505091912.t49JCHRf067749@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On May 9, 2015, at 12:12, Baptiste Daroussin <bapt@FreeBSD.org> wrote: > > Author: bapt > Date: Sat May 9 19:12:16 2015 > New Revision: 282685 > URL: https://svnweb.freebsd.org/changeset/base/282685 > > Log: > Replace malloc(3) + strcpy(3) + strcat(3) by asprintf(3) > > Modified: > head/usr.sbin/pw/pw_user.c > > Modified: head/usr.sbin/pw/pw_user.c > ============================================================================== > --- head/usr.sbin/pw/pw_user.c Sat May 9 19:11:01 2015 (r282684) > +++ head/usr.sbin/pw/pw_user.c Sat May 9 19:12:16 2015 (r282685) > @@ -363,11 +363,9 @@ pw_user(struct userconf * cnf, int mode, > if (mode == M_LOCK) { > if (strncmp(pwd->pw_passwd, locked_str, sizeof(locked_str)-1) == 0) > errx(EX_DATAERR, "user '%s' is already locked", pwd->pw_name); > - passtmp = malloc(strlen(pwd->pw_passwd) + sizeof(locked_str)); > + asprintf(&passtmp, "%s%s", locked_str, pwd->pw_passwd); > if (passtmp == NULL) /* disaster */ > errx(EX_UNAVAILABLE, "out of memory"); > - strcpy(passtmp, locked_str); > - strcat(passtmp, pwd->pw_passwd); > pwd->pw_passwd = passtmp; > edited = 1; > } else if (mode == M_UNLOCK) { Please check the return values from asprintf..
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4DE758E7-BE6B-45D6-A184-9443FB21F4A7>