Fix luv_check_* to actually check for valid structs

luvit · Nov 3, 2014 · e02ef82 · e02ef82
1 parent 9d5fbb3
commit e02ef82
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 19 deletions.
diff --git a/src/async.c b/src/async.c
@@ -18,7 +18,7 @@
 
 static uv_async_t* luv_check_async(lua_State* L, int index) {
   uv_async_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_ASYNC, index, "Expected uv_async_t");
+  luaL_argcheck(L, handle->type == UV_ASYNC && handle->data, index, "Expected uv_async_t");
   return handle;
 }
 

diff --git a/src/check.c b/src/check.c
@@ -18,7 +18,7 @@
 
 static uv_check_t* luv_check_check(lua_State* L, int index) {
   uv_check_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_CHECK, index, "Expected uv_check_t");
+  luaL_argcheck(L, handle->type == UV_CHECK && handle->data, index, "Expected uv_check_t");
   return handle;
 }
 

diff --git a/src/fs.c b/src/fs.c
@@ -19,7 +19,7 @@
 
 static uv_fs_t* luv_check_fs(lua_State* L, int index) {
   uv_fs_t* req = luaL_checkudata(L, index, "uv_req");
-  luaL_argcheck(L, req->type = UV_FS, index, "Expected uv_fs_t");
+  luaL_argcheck(L, req->type = UV_FS && req->data, index, "Expected uv_fs_t");
   return req;
 }
 

diff --git a/src/fs_event.c b/src/fs_event.c
@@ -19,7 +19,7 @@
 
 static uv_fs_event_t* luv_check_fs_event(lua_State* L, int index) {
   uv_fs_event_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_FS_EVENT, index, "Expected uv_fs_event_t");
+  luaL_argcheck(L, handle->type == UV_FS_EVENT && handle->data, index, "Expected uv_fs_event_t");
   return handle;
 }
 

diff --git a/src/fs_poll.c b/src/fs_poll.c
@@ -19,7 +19,7 @@
 
 static uv_fs_poll_t* luv_check_fs_poll(lua_State* L, int index) {
   uv_fs_poll_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_FS_POLL, index, "Expected uv_fs_poll_t");
+  luaL_argcheck(L, handle->type == UV_FS_POLL && handle->data, index, "Expected uv_fs_poll_t");
   return handle;
 }
 

diff --git a/src/handle.c b/src/handle.c
@@ -17,7 +17,9 @@
 #include "luv.h"
 
 static uv_handle_t* luv_check_handle(lua_State* L, int index) {
-  return luaL_checkudata(L, index, "uv_handle");
+  uv_handle_t* handle = luaL_checkudata(L, index, "uv_handle");
+  luaL_argcheck(L, handle->data, index, "Expected uv_handle_t");
+  return handle;
 }
 
 // Show the libuv type instead of generic "userdata"

diff --git a/src/idle.c b/src/idle.c
@@ -18,7 +18,7 @@
 
 static uv_idle_t* luv_check_idle(lua_State* L, int index) {
   uv_idle_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_IDLE, index, "Expected uv_idle_t");
+  luaL_argcheck(L, handle->type == UV_IDLE && handle->data, index, "Expected uv_idle_t");
   return handle;
 }
 

diff --git a/src/pipe.c b/src/pipe.c
@@ -18,7 +18,7 @@
 
 static uv_pipe_t* luv_check_pipe(lua_State* L, int index) {
   uv_pipe_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_NAMED_PIPE, index, "Expected uv_pipe_t");
+  luaL_argcheck(L, handle->type == UV_NAMED_PIPE && handle->data, index, "Expected uv_pipe_t");
   return handle;
 }
 

diff --git a/src/poll.c b/src/poll.c
@@ -18,7 +18,7 @@
 
 static uv_poll_t* luv_check_poll(lua_State* L, int index) {
   uv_poll_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_POLL, index, "Expected uv_poll_t");
+  luaL_argcheck(L, handle->type == UV_POLL && handle->data, index, "Expected uv_poll_t");
   return handle;
 }
 

diff --git a/src/prepare.c b/src/prepare.c
@@ -18,7 +18,7 @@
 
 static uv_prepare_t* luv_check_prepare(lua_State* L, int index) {
   uv_prepare_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_PREPARE, index, "Expected uv_prepare_t");
+  luaL_argcheck(L, handle->type == UV_PREPARE && handle->data, index, "Expected uv_prepare_t");
   return handle;
 }
 

diff --git a/src/process.c b/src/process.c
@@ -23,7 +23,7 @@ static int luv_disable_stdio_inheritance(lua_State* L) {
 
 static uv_process_t* luv_check_process(lua_State* L, int index) {
   uv_process_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_PROCESS, index, "Expected uv_process_t");
+  luaL_argcheck(L, handle->type == UV_PROCESS && handle->data, index, "Expected uv_process_t");
   return handle;
 }
 

diff --git a/src/req.c b/src/req.c
@@ -17,7 +17,9 @@
 #include "luv.h"
 
 static uv_req_t* luv_check_req(lua_State* L, int index) {
-  return luaL_checkudata(L, index, "uv_req");
+  uv_req_t* req = luaL_checkudata(L, index, "uv_req");
+  luaL_argcheck(L, req->data, index, "Expected uv_req_t");
+  return req;
 }
 
 static int luv_req_tostring(lua_State* L) {

diff --git a/src/signal.c b/src/signal.c
@@ -50,7 +50,7 @@ static int luv_string_to_signal(const char* string) {
 
 static uv_signal_t* luv_check_signal(lua_State* L, int index) {
   uv_signal_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_SIGNAL, index, "Expected uv_signal_t");
+  luaL_argcheck(L, handle->type == UV_SIGNAL && handle->data, index, "Expected uv_signal_t");
   return handle;
 }
 

diff --git a/src/stream.c b/src/stream.c
@@ -18,10 +18,10 @@
 
 static uv_stream_t* luv_check_stream(lua_State* L, int index) {
   uv_stream_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L,
+  luaL_argcheck(L, handle->data && (
     handle->type == UV_TCP ||
     handle->type == UV_TTY ||
-    handle->type == UV_NAMED_PIPE,
+    handle->type == UV_NAMED_PIPE),
     index, "uv_stream_t subclass required");
   return handle;
 }

diff --git a/src/tcp.c b/src/tcp.c
@@ -18,7 +18,7 @@
 
 static uv_tcp_t* luv_check_tcp(lua_State* L, int index) {
   uv_tcp_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_TCP, index, "Expected uv_tcp_t");
+  luaL_argcheck(L, handle->type == UV_TCP && handle->data, index, "Expected uv_tcp_t");
   return handle;
 }
 

diff --git a/src/timer.c b/src/timer.c
@@ -18,7 +18,7 @@
 
 static uv_timer_t* luv_check_timer(lua_State* L, int index) {
   uv_timer_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_TIMER, index, "Expected uv_timer_t");
+  luaL_argcheck(L, handle->type == UV_TIMER && handle->data, index, "Expected uv_timer_t");
   return handle;
 }
 

diff --git a/src/tty.c b/src/tty.c
@@ -18,7 +18,7 @@
 
 static uv_tty_t* luv_check_tty(lua_State* L, int index) {
   uv_tty_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_TTY, index, "Expected uv_tty_t");
+  luaL_argcheck(L, handle->type == UV_TTY && handle->data, index, "Expected uv_tty_t");
   return handle;
 }
 

diff --git a/src/udp.c b/src/udp.c
@@ -18,7 +18,7 @@
 
 static uv_udp_t* luv_check_udp(lua_State* L, int index) {
   uv_udp_t* handle = luaL_checkudata(L, index, "uv_handle");
-  luaL_argcheck(L, handle->type = UV_UDP, index, "Expected uv_udp_t");
+  luaL_argcheck(L, handle->type == UV_UDP && handle->data, index, "Expected uv_udp_t");
   return handle;
 }