RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-22 18:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [openbsd-compat/bsd-poll.c] Don't bother checking for non-NULL

Browse Source 
before freeing since free(NULL) is a no-op.  ok djm.
This commit is contained in:
Darren Tucker 2014-02-06 10:44:13 +11:00
parent a0959da368
commit 8d36f9ac71
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
20140206
- (dtucker) [openbsd-compat/bsd-poll.c] Don't bother checking for non-NULL
before freeing since free(NULL) is a no-op. ok djm.
20140205 20140205
- (djm) [sandbox-capsicum.c] Don't fatal if Capsicum is offered by - (djm) [sandbox-capsicum.c] Don't fatal if Capsicum is offered by
headers/libc but not supported by the kernel. Patch from Loganaden headers/libc but not supported by the kernel. Patch from Loganaden

11
openbsd-compat/bsd-poll.c
View File

@ -1,4 +1,4 @@
/* $Id: bsd-poll.c,v 1.5 2013/11/08 10:12:58 dtucker Exp $ */ /* $Id: bsd-poll.c,v 1.6 2014/02/05 23:44:13 dtucker Exp $ */
/* /*
* Copyright (c) 2004, 2005, 2007 Darren Tucker (dtucker at zip com au). * Copyright (c) 2004, 2005, 2007 Darren Tucker (dtucker at zip com au).
@ -109,12 +109,9 @@ poll(struct pollfd *fds, nfds_t nfds, int timeout)
} }
out: out:
if (readfds != NULL) free(readfds);
free(readfds); free(writefds);
if (writefds != NULL) free(exceptfds);
free(writefds);
if (exceptfds != NULL)
free(exceptfds);
if (ret == -1) if (ret == -1)
errno = saved_errno; errno = saved_errno;
return ret; return ret;