ubusd: fix a memory leak on user/group client info

[project/ubus.git] / libubus-io.c

diff --git a/libubus-io.c b/libubus-io.c
index fa53040..b9b3128 100644 (file)
--- a/libubus-io.c
+++ b/libubus-io.c
@@ -11,6 +11,7 @@
  * GNU General Public License for more details.
  */
 
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
@@ -53,7 +54,7 @@ static void wait_data(int fd, bool write)
        struct pollfd pfd = { .fd = fd };
 
        pfd.events = write ? POLLOUT : POLLIN;
-       poll(&pfd, 1, 0);
+       poll(&pfd, 1, -1);
 }
 
 static int writev_retry(int fd, struct iovec *iov, int iov_len, int sock_fd)
@@ -292,7 +293,8 @@ static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
 
        iov.iov_base = (char *)ctx->msgbuf.data + sizeof(hdrbuf.data);
        iov.iov_len = blob_len(ctx->msgbuf.data);
-       if (iov.iov_len > 0 && !recv_retry(ctx->sock.fd, &iov, true, NULL))
+       if (iov.iov_len > 0 &&
+           recv_retry(ctx->sock.fd, &iov, true, NULL) <= 0)
                return false;
 
        return true;
@@ -320,7 +322,7 @@ void __hidden ubus_poll_data(struct ubus_context *ctx, int timeout)
                .events = POLLIN | POLLERR,
        };
 
-       poll(&pfd, 1, timeout);
+       poll(&pfd, 1, timeout ? timeout : -1);
        ubus_handle_data(&ctx->sock, ULOOP_READ);
 }