d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ftpd: replace malloc + memset 0 with calloc.

Browse Source 
It is faster and usually safer.
Use NULL instead of zero for the pointer.
This commit is contained in:
Pedro F. Giffuni 2016-04-18 15:01:49 +00:00
parent d5808ebf65
commit 6e4fcca0f8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=298211
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libexec/ftpd/popen.c
View File

@ -81,9 +81,8 @@ ftpd_popen(char *program, char *type)
if (!pids) {
if ((fds = getdtablesize()) <= 0)
return (NULL);
if ((pids = malloc(fds * sizeof(int))) == NULL)
if ((pids = calloc(fds, sizeof(int))) == NULL)
return (NULL);
memset(pids, 0, fds * sizeof(int));
}
if (pipe(pdes) < 0)
return (NULL);
@ -185,7 +184,7 @@ ftpd_pclose(FILE *iop)
* pclose returns -1 if stream is not associated with a
* `popened' command, or, if already `pclosed'.
*/
if (pids == 0 || pids[fdes = fileno(iop)] == 0)
if (pids == NULL || pids[fdes = fileno(iop)] == 0)
return (-1);
(void)fclose(iop);
omask = sigblock(sigmask(SIGINT)|sigmask(SIGQUIT)|sigmask(SIGHUP));