ncurses 5.9 - patch 20140906

[ncurses.git] / ncurses / tty / lib_twait.c

diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c
index 3cd2cafc44304d7762a32f341a97d3c093c1dec9..59942f771fddaea49dea2ab2a651e3c886263f10 100644 (file)
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -75,7 +75,7 @@
 #endif
 #undef CUR
 
-MODULE_ID("$Id: lib_twait.c,v 1.64 2012/02/18 20:32:55 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.68 2014/03/08 20:32:59 tom Exp $")
 
 static long
 _nc_gettime(TimeType * t0, int first)
@@ -102,7 +102,7 @@ _nc_gettime(TimeType * t0, int first)
     if (first) {
        *t0 = t1;
     }
-    res = (t1 - *t0) * 1000;
+    res = (long) ((t1 - *t0) * 1000);
 #endif
     TR(TRACE_IEVENT, ("%s time: %ld msec", first ? "get" : "elapsed", res));
     return res;
@@ -229,8 +229,11 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
     memset(fd_list, 0, sizeof(fd_list));
 
 #ifdef NCURSES_WGETCH_EVENTS
-    if ((mode & TW_EVENT) && evl)
+    if ((mode & TW_EVENT) && evl) {
        fds = typeMalloc(struct pollfd, MIN_FDS + evl->count);
+       if (fds == 0)
+           return TW_NONE;
+    }
 #endif
 
     if (mode & TW_INPUT) {
@@ -286,10 +289,6 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
            }
        }
     }
-
-    if (fds != fd_list)
-       free((char *) fds);
-
 #endif
 
 #elif defined(__BEOS__)
@@ -502,5 +501,12 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
        result |= TW_EVENT;
 #endif
 
+#if USE_FUNC_POLL
+#ifdef NCURSES_WGETCH_EVENTS
+    if (fds != fd_list)
+       free((char *) fds);
+#endif
+#endif
+
     return (result);
 }