beginners mistake

[software/libev.git] / ev_select.c

diff --git a/ev_select.c b/ev_select.c
index 1262f48659bc5d21f0c8f4b2381492cd8c62a192..46a77e208c06870d411f3cb50fdbcbc5cfa326fe 100644 (file)
--- a/ev_select.c
+++ b/ev_select.c
@@ -49,12 +49,16 @@ select_modify (int fd, int oev, int nev)
 
   if (vec_max < (fd >> 5) + 1)
     {
-      vec_max = (fd >> 5) + 1;
+      int new_max = (fd >> 5) + 1;
 
-      vec_ri = (unsigned char *)realloc (vec_ri, vec_max * 4);
-      vec_ro = (unsigned char *)realloc (vec_ro, vec_max * 4); /* could free/malloc */
-      vec_wi = (unsigned char *)realloc (vec_wi, vec_max * 4);
-      vec_wo = (unsigned char *)realloc (vec_wo, vec_max * 4); /* could free/malloc */
+      vec_ri = (unsigned char *)realloc (vec_ri, new_max * 4);
+      vec_ro = (unsigned char *)realloc (vec_ro, new_max * 4); /* could free/malloc */
+      vec_wi = (unsigned char *)realloc (vec_wi, new_max * 4);
+      vec_wo = (unsigned char *)realloc (vec_wo, new_max * 4); /* could free/malloc */
+
+      for (; vec_max < new_max; ++vec_max)
+        ((uint32_t *)vec_ri)[vec_max] =
+        ((uint32_t *)vec_wi)[vec_max] = 0;
     }
 
   vec_ri [offs] |= mask;
@@ -106,6 +110,11 @@ static void select_poll (ev_tstamp timeout)
               }
         }
     }
+  else if (res < 0)
+    {
+      if (errno == EBADF)
+        fd_recheck ();
+    }
 }
 
 void select_init (int flags)