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

   before freeing since free(NULL) is a no-op.  ok djm.

diff --git a/ChangeLog b/ChangeLog
index df7312df8dda584452dc06539905be645a0f90d9..3867fd37e93694cbd3ad7a553b84eeac41c1ed3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
  - (djm) [sandbox-capsicum.c] Don't fatal if Capsicum is offered by
    headers/libc but not supported by the kernel. Patch from Loganaden

diff --git a/openbsd-compat/bsd-poll.c b/openbsd-compat/bsd-poll.c
index c7ef82776a7604db9d6450f2a0c367c747382e24..73a85248031ef4f1ac7a7579ab16eb22f8342b04 100644 (file)
--- a/openbsd-compat/bsd-poll.c
+++ b/openbsd-compat/bsd-poll.c
@@ -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).
@@ -109,12 +109,9 @@ poll(struct pollfd *fds, nfds_t nfds, int timeout)
        }
 
 out:
-       if (readfds != NULL)
-               free(readfds);
-       if (writefds != NULL)
-               free(writefds);
-       if (exceptfds != NULL)
-               free(exceptfds);
+       free(readfds);
+       free(writefds);
+       free(exceptfds);
        if (ret == -1)
                errno = saved_errno;
        return ret;