[pulseaudio-commits] Branch 'next' - src/pulsecore

[Georg Chini]

 src/pulsecore/core-util.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5d5d1e1e1000fc10c6d8f8274328dcc6738b245d
Author: Georg Chini <georg at chini.tk>
Date:   Tue Feb 13 18:17:08 2018 +0100

    core-util: correct error in set_nonblock()
    
    set_nonblock() will always set the file descriptor to non-blocking,
    regardless of the nonblock argument.
    
    This patch fixes the issue by passing the correct argument to the
    fcntl() call. The bug had no impact because there is only one caller
    of pa_make_fd_block() in poll-win32.c

diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 64e9f217..7f627539 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -202,7 +202,7 @@ static void set_nonblock(int fd, bool nonblock) {
         nv = v & ~O_NONBLOCK;
 
     if (v != nv)
-        pa_assert_se(fcntl(fd, F_SETFL, v|O_NONBLOCK) >= 0);
+        pa_assert_se(fcntl(fd, F_SETFL, nv) >= 0);
 
 #elif defined(OS_IS_WIN32)
     u_long arg;