Fix crash in record conv rule select YAZ-812

[yaz-moved-to-github.git] / src / poll.c

diff --git a/src/poll.c b/src/poll.c
index f3584d7..833366e 100644 (file)
--- a/src/poll.c
+++ b/src/poll.c
@@ -1,9 +1,9 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /**
- * \file 
+ * \file
  * \brief Select, poll wrapper
  */
 #if HAVE_CONFIG_H
@@ -60,7 +60,7 @@ int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
     FD_ZERO(&output);
     FD_ZERO(&except);
 
-    assert(num_fds > 0);
+    assert(num_fds >= 0);
     for (i = 0; i < num_fds; i++)
     {
         enum yaz_poll_mask mask = fds[i].input_mask;
@@ -81,7 +81,7 @@ int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
     }
     tv.tv_sec = sec;
     tv.tv_usec = nsec / 1000;
-    
+
     r = select(max_fd+1, &input, &output, &except, (sec == -1 ? 0 : &tv));
     if (r >= 0)
     {
@@ -108,12 +108,13 @@ int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 #if HAVE_SYS_POLL_H
 int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 {
-    int r;
-    struct pollfd *pollfds = (struct pollfd *) 
-        xmalloc(num_fds * sizeof *pollfds);
-    int i;
+    int i, r;
+    struct pollfd *pollfds = 0;
+
+    if (num_fds > 0)
+        pollfds = (struct pollfd *) xmalloc(num_fds * sizeof *pollfds);
 
-    assert(num_fds > 0);
+    assert(num_fds >= 0);
     for (i = 0; i < num_fds; i++)
     {
         enum yaz_poll_mask mask = fds[i].input_mask;