Openwall GNU/*/Linux - a small security-enhanced Linux distro for servers
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Tue, 2 Apr 2019 10:40:41 -0400
From: Rich Felker <dalias@...c.org>
To: musl@...ts.openwall.com
Subject: Re: [PATCH 1/2] use __strchrnul instead of strchr and strlen

On Tue, Apr 02, 2019 at 05:57:33AM -0400, Frediano Ziglio wrote:
> ping

Thanks for the ping. Applying!

Rich


> > The result is the same but takes less code.
> > Note that __execvpe calls getenv which calls __strchrnul so even
> > using static output the size of the executable won't grow.
> > ---
> >  src/process/execvp.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/src/process/execvp.c b/src/process/execvp.c
> > index 1fdf036f..ef3b9dd5 100644
> > --- a/src/process/execvp.c
> > +++ b/src/process/execvp.c
> > @@ -28,8 +28,7 @@ int __execvpe(const char *file, char *const argv[], char
> > *const envp[])
> >  
> >  	for(p=path; ; p=z) {
> >  		char b[l+k+1];
> > -		z = strchr(p, ':');
> > -		if (!z) z = p+strlen(p);
> > +		z = __strchrnul(p, ':');
> >  		if (z-p >= l) {
> >  			if (!*z++) break;
> >  			continue;

Powered by blists - more mailing lists

Your e-mail address:

Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.