[MPlayer-cvslog] r24156 - trunk/input/input.c

[reimar]

Author: reimar
Date: Sat Aug 25 09:08:49 2007
New Revision: 24156

Log:
HACK: check added fds for validity because otherwise mplayer
crashes due to using FD_SET on -1


Modified:
   trunk/input/input.c

Modified: trunk/input/input.c
==============================================================================
--- trunk/input/input.c	(original)
+++ trunk/input/input.c	Sat Aug 25 09:08:49 2007
@@ -600,6 +600,10 @@ mp_input_add_cmd_fd(int fd, int select, 
     mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantRegister2ManyCmdFds,fd);
     return 0;
   }
+  if (fd < 0) {
+    mp_msg(MSGT_INPUT, MSGL_ERR, "Invalid fd %i in mp_input_add_cmd_fd", fd);
+    return 0;
+  }
 
   memset(&cmd_fds[num_cmd_fd],0,sizeof(mp_input_fd_t));
   cmd_fds[num_cmd_fd].fd = fd;
@@ -655,6 +659,10 @@ mp_input_add_key_fd(int fd, int select, 
     mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantRegister2ManyKeyFds,fd);
     return 0;
   }
+  if (fd < 0) {
+    mp_msg(MSGT_INPUT, MSGL_ERR, "Invalid fd %i in mp_input_add_key_fd", fd);
+    return 0;
+  }
 
   memset(&key_fds[num_key_fd],0,sizeof(mp_input_fd_t));
   key_fds[num_key_fd].fd = fd;
@@ -673,6 +681,10 @@ mp_input_add_event_fd(int fd, void (*rea
     mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantRegister2ManyKeyFds,fd);
     return 0;
   }
+  if (fd < 0) {
+    mp_msg(MSGT_INPUT, MSGL_ERR, "Invalid fd %i in mp_input_add_event_fd", fd);
+    return 0;
+  }
 
   memset(&key_fds[num_key_fd],0,sizeof(mp_input_fd_t));
   key_fds[num_key_fd].fd = fd;