merge

[irc/quakenet/newserv.git] / lua / luasocket.c

diff --git a/lua/luasocket.c b/lua/luasocket.c
index 8e461f1adf09a9b7040babb663f3ec2b12b37a9a..3aa6f6e5c3a87ab05bb179b1ad4c92e705e7360e 100644 (file)
--- a/lua/luasocket.c
+++ b/lua/luasocket.c
@@ -41,13 +41,13 @@ static int lua_socket_unix_connect(lua_State *l) {
   if(!path)
     return 0;
 
-  ls = (lua_socket *)malloc(sizeof(lua_socket));
+  ls = (lua_socket *)luamalloc(sizeof(lua_socket));
   if(!ls)
     return 0;
 
   ls->fd = socket(AF_UNIX, SOCK_STREAM, 0);
   if(ls->fd <= -1) {
-    free(ls);
+    luafree(ls);
     return 0;
   }
 
@@ -61,14 +61,14 @@ static int lua_socket_unix_connect(lua_State *l) {
   /* WTB exceptions */
   ret = fcntl(ls->fd, F_GETFL, 0);
   if(ret < 0) {
-    free(ls);
+    luafree(ls);
     close(ls->fd);
     return 0;
   }
 
   ret = fcntl(ls->fd, F_SETFL, ret | O_NONBLOCK);
   if(ret < 0) {
-    free(ls);
+    luafree(ls);
     close(ls->fd);
     return 0;
   }
@@ -79,7 +79,7 @@ static int lua_socket_unix_connect(lua_State *l) {
   } else if(ret == -1 && (errno == EINPROGRESS)) {
     ls->state = SOCKET_CONNECTING;
   } else {
-    free(ls);
+    luafree(ls);
     close(ls->fd);
     return 0;
   }
@@ -147,7 +147,7 @@ static void lua_socket_call_close(lua_socket *ls) {
       luaL_unref(ls->l->l, LUA_REGISTRYINDEX, ls->tag);
       luaL_unref(ls->l->l, LUA_REGISTRYINDEX, ls->handler);
 
-      free(ls);
+      luafree(ls);
       return;
     }
   }