From ef0ae0c73687e804fe86854af3c36f9d3f90fcf8 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 25 Feb 2010 14:50:55 +0000 Subject: luaevent.c: Fix potential overflow in converting seconds to timeval --- src/luaevent.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/luaevent.c b/src/luaevent.c index 6036cf1..89c295a 100644 --- a/src/luaevent.c +++ b/src/luaevent.c @@ -56,8 +56,8 @@ int getSocketFd(lua_State* L, int idx) { } void load_timeval(double time, struct timeval *tv) { - tv->tv_sec = (int)time; - tv->tv_usec = (int)(time * 1000000) % 1000000; + tv->tv_sec = (int) time; + tv->tv_usec = (int)( (time - tv->tv_sec) * 1000000 ); } /* sock, event, callback, timeout */ -- cgit v1.2.3 From d1c516f4beb47e79fb886e46a4b6e0cf432d850a Mon Sep 17 00:00:00 2001 From: James Snyder Date: Wed, 3 Mar 2010 18:19:20 -0600 Subject: Changes to compile on OS X. - BSD version of install doesn't have -D flag - stdlib.h should include malloc defs (malloc.h is obsolete) --- src/buffer_event.c | 2 +- src/event_buffer.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/buffer_event.c b/src/buffer_event.c index deb1963..70b726c 100644 --- a/src/buffer_event.c +++ b/src/buffer_event.c @@ -1,9 +1,9 @@ /* LuaEvent - Copyright (C) 2007 Thomas Harning * Licensed as LGPL - See doc/COPYING for details */ +#include #include "buffer_event.h" #include "utility.h" #include -#include #include "event_buffer.h" #define BUFFER_EVENT_MT "BUFFER_EVENT_MT" diff --git a/src/event_buffer.c b/src/event_buffer.c index ea66a94..a61c643 100644 --- a/src/event_buffer.c +++ b/src/event_buffer.c @@ -1,9 +1,8 @@ /* LuaEvent - Copyright (C) 2007 Thomas Harning * Licensed as LGPL - See doc/COPYING for details */ - +#include #include "event_buffer.h" #include -#include #define EVENT_BUFFER_MT "EVENT_BUFFER_MT" -- cgit v1.2.3