This repository was archived by the owner on Nov 20, 2020. It is now read-only.

lua5.2 support and fd leak fixed if pipe() or fork() fails#1

Open
fabled wants to merge 1 commit into
base:master
Choose a base branch
from
Open

lua5.2 support and fd leak fixed if pipe() or fork() fails #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
LUA_PREFIX = /usr/local/
PREFIX = /usr/local/
LUA_PKGCONF ?= lua

MODULE = lpc
VERSION = 1.0.0

INSTALL_PREFIX = $(PREFIX)/lib/lua/5.1/
ifneq ($(shell pkg-config $(LUA_PKGCONF) || echo not-installed),)
$(error $(LUA_PKGCONF).pc not found)
endif

INSTALL_PREFIX = $(DESTDIR)$(shell pkg-config $(LUA_PKGCONF) --variable=INSTALL_CMOD)

CC = gcc
TARGET = lpc.so
OBJS = lpc.o
LIBS =
CFLAGS = -I $(LUA_PREFIX)/include -fPIC
LDFLAGS = -shared -fPIC
CFLAGS = $(shell pkg-config $(LUA_PKGCONF) --cflags) -fPIC
LDFLAGS = $(shell pkg-config $(LUA_PKGCONF) --libs) -shared -fPIC

default: $(TARGET)

Expand Down
178 changes: 112 additions & 66 deletions lpc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
/*
** LuaProcessCall
** Copyright DarkGod 2007
**
** lua 5.1/5.2 compat (c) 2014 Timo Teräs
*/

#include <errno.h>
Expand All@@ -15,47 +15,98 @@
#include "lauxlib.h"
#include "lualib.h"

#define topfile(L) ((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE))
#if LUA_VERSION_NUM < 502

static FILE *tofile (lua_State *L) {
FILE **f = topfile(L);
if (*f == NULL)
luaL_error(L, "attempt to use a closed file");
return *f;
static int lua_absindex(lua_State *L, int idx) {
return (idx > 0 || idx <= LUA_REGISTRYINDEX)? idx : lua_gettop(L) + idx + 1;
} /* lua_absindex() */

static void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
int i, t = lua_absindex(L, -1 - nup);

for (; l->name; l++) {
for (i = 0; i < nup; i++)
lua_pushvalue(L, -nup);
lua_pushcclosure(L, l->func, nup);
lua_setfield(L, t, l->name);
}

lua_pop(L, nup);
} /* luaL_setfuncs() */

#define luaL_newlibtable(L, l) \
lua_createtable(L, 0, (sizeof (l) / sizeof *(l)) - 1)

#define luaL_newlib(L, l) \
(luaL_newlibtable((L), (l)), luaL_setfuncs((L), (l), 0))

#ifndef LUA_FILEHANDLE /* Not defined by earlier LuaJIT releases */
#define LUA_FILEHANDLE "FILE*"
#endif

/*
* Lua 5.1 userdata is a simple FILE *, while LuaJIT is a struct with the
* first member a FILE *, similar to Lua 5.2.
*/
typedef struct luaL_Stream {
FILE *f;
} luaL_Stream;

static int luaL_fileresult(lua_State *L, int stat, const char *filename) {
int en = errno; /* calls to Lua API may change this value */
if (stat) {
lua_pushboolean(L, 1);
return 1;
}
else {
lua_pushnil(L);
if (filename)
lua_pushfstring(L, "%s: %s", filename, strerror(en));
else
lua_pushfstring(L, "%s", strerror(en));
lua_pushinteger(L, en);
return 3;
}
}

static int pushresult (lua_State *L, int i, const char *filename) {
int en = errno; /* calls to Lua API may change this value */
if (i) {
lua_pushboolean(L, 1);
return 1;
}
else {
lua_pushnil(L);
if (filename)
lua_pushfstring(L, "%s: %s", filename, strerror(en));
else
lua_pushfstring(L, "%s", strerror(en));
lua_pushinteger(L, en);
return 3;
}
#define isclosed(p) ((p)->f == NULL)
#define markclosed(p) ((p)->f = NULL)

#else

#define isclosed(p) ((p)->closef == NULL)
#define markclosed(p) ((p)->closef = NULL)

#endif

#define tolstream(L) ((luaL_Stream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))

static FILE *tofile (lua_State *L) {
luaL_Stream *p = tolstream(L);
if (isclosed(p))
luaL_error(L, "attempt to use a closed file");
return p->f;
}

static int io_fclose (lua_State *L) {
FILE **p = topfile(L);
int ok = (fclose(*p) == 0);
*p = NULL;
return pushresult(L, ok, NULL);
static int io_fclose (lua_State *L)
{
luaL_Stream *p = tolstream(L);
int res = fclose(p->f);
markclosed(p);
return luaL_fileresult(L, (res == 0), NULL);
}

static FILE **newfile_fd(lua_State *L, int fd, const char *mode)
static luaL_Stream *newfile_fd(lua_State *L, int fd, const char *mode)
{
FILE **pf = (FILE **)lua_newuserdata(L, sizeof(FILE *));
*pf = NULL; /* file handle is currently `closed' */
luaL_Stream *p = (luaL_Stream *) lua_newuserdata(L, sizeof(luaL_Stream));
markclosed(p);
luaL_getmetatable(L, LUA_FILEHANDLE);
lua_setmetatable(L, -2);
*pf = fdopen(fd, mode);
return pf;
p->f = fdopen(fd, mode);
#if LUA_VERSION_NUM >= 502
p->closef = &io_fclose;
#endif
return p;
}

static int lpc_run(lua_State *L)
Expand All@@ -64,12 +115,12 @@ static int lpc_run(lua_State *L)
int p_in[2];
int pid;

if (pipe(p_out) == -1) { lua_pushnil(L); return 1; }
if (pipe(p_in) == -1) { lua_pushnil(L); return 1; }
if (pipe(p_out) == -1) goto err_noclose;
if (pipe(p_in) == -1) goto err_closeout;
if ((pid = fork()) == -1) goto err_closeinout;

if ((pid = fork()) == -1) { lua_pushnil(L); return 1; }
else if (pid == 0)
{
if (pid == 0) {
/* child */
char **args;
int n = lua_gettop(L); /* number of arguments */
int i;
Expand All@@ -93,20 +144,24 @@ static int lpc_run(lua_State *L)
_exit(1);
return 0;
}
else
{
FILE **in;
FILE **out;

/* Cleanup */
close(p_out[0]);
close(p_in[1]);

lua_pushnumber(L, pid);
out = newfile_fd(L, p_out[1], "w");
in = newfile_fd(L, p_in[0], "r");
return 3;
}
/* Cleanup */
close(p_out[0]);
close(p_in[1]);
lua_pushnumber(L, pid);
newfile_fd(L, p_out[1], "w");
newfile_fd(L, p_in[0], "r");
return 3;

err_closeinout:
close(p_in[0]);
close(p_in[1]);
err_closeout:
close(p_out[0]);
close(p_out[1]);
err_noclose:
lua_pushnil(L);
return 1;
}

static int lpc_wait(lua_State *L)
Expand All@@ -116,13 +171,9 @@ static int lpc_wait(lua_State *L)
int nonblock = luaL_optinteger(L, 2, 0);

if (waitpid(pid, &ret, (nonblock == 1) ? WNOHANG : 0) == pid)
{
lua_pushnumber(L, ret);
}
else
{
lua_pushnil(L);
}
return 1;
}

Expand All@@ -141,13 +192,9 @@ static int f_readable(lua_State *L)
FD_SET(fileno(f), &rfds);
retval = select(1 + fileno(f), &rfds, NULL, NULL, &tv);
if (retval == 1)
{
lua_pushboolean(L, 1);
}
else
{
lua_pushnil(L);
}
return 1;
}

Expand All@@ -166,13 +213,9 @@ static int f_writable(lua_State *L)
FD_SET(fileno(f), &wfds);
retval = select(1 + fileno(f), NULL, &wfds, NULL, &tv);
if (retval == 1)
{
lua_pushboolean(L, 1);
}
else
{
lua_pushboolean(L, 0);
}
return 1;
}

Expand All@@ -192,7 +235,7 @@ static void set_info (lua_State *L)
lua_settable (L, -3);
}

static const struct luaL_reg lpclib[] =
static const struct luaL_Reg lpclib[] =
{
{"run", lpc_run},
{"wait", lpc_wait},
Expand All@@ -207,15 +250,15 @@ static const luaL_Reg io_add_flib[] = {

static void createmeta(lua_State *L)
{
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
luaL_register(L, NULL, io_add_flib); /* file methods */
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
luaL_setfuncs(L, io_add_flib, 0); /* file methods */
}


int luaopen_lpc (lua_State *L)
{
createmeta(L);

#if LUA_VERSION_NUM < 502
luaL_openlib(L, "lpc", lpclib, 0);

/* create environment for 'run' */
Expand All@@ -225,6 +268,9 @@ int luaopen_lpc (lua_State *L)
lua_setfield(L, -2, "__close");
lua_setfenv(L, -2);
lua_pop(L, 1); /* pop 'run' */
#else
luaL_newlib(L, lpclib);
#endif

set_info(L);
return 1;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Nov 20, 2020. It is now read-only.

lua5.2 support and fd leak fixed if pipe() or fork() fails#1
 Open

fabled
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


lua5.2 support and fd leak fixed if pipe() or fork() fails
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 9 additions & 5 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
LUA_PREFIX = /usr/local/
PREFIX	= /usr/local/
LUA_PKGCONF ?= lua

MODULE = lpc
VERSION = 1.0.0

INSTALL_PREFIX = $(PREFIX)/lib/lua/5.1/
ifneq ($(shell pkg-config $(LUA_PKGCONF) || echo not-installed),)
$(error $(LUA_PKGCONF).pc not found)
endif

INSTALL_PREFIX = $(DESTDIR)$(shell pkg-config $(LUA_PKGCONF) --variable=INSTALL_CMOD)

CC	= gcc
TARGET	= lpc.so
OBJS	= lpc.o
LIBS	=
CFLAGS	= -I $(LUA_PREFIX)/include -fPIC
LDFLAGS	= -shared -fPIC
CFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --cflags) -fPIC
LDFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --libs) -shared -fPIC

default: $(TARGET)

Expand Down

178 changes: 112 additions & 66 deletions
lpc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
/*
** LuaProcessCall
** Copyright DarkGod 2007
**
** lua 5.1/5.2 compat (c) 2014 Timo Teräs
*/

#include <errno.h>
Expand All@@ -15,47 +15,98 @@
#include "lauxlib.h"
#include "lualib.h"

#define topfile(L)	((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE))
#if LUA_VERSION_NUM < 502

static FILE *tofile (lua_State *L) {
 FILE **f = topfile(L);
 if (*f == NULL)
 luaL_error(L, "attempt to use a closed file");
 return *f;
static int lua_absindex(lua_State *L, int idx) {
	return (idx > 0 || idx <= LUA_REGISTRYINDEX)? idx : lua_gettop(L) + idx + 1;
} /* lua_absindex() */

static void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
	int i, t = lua_absindex(L, -1 - nup);

	for (; l->name; l++) {
 for (i = 0; i < nup; i++)
 lua_pushvalue(L, -nup);
 lua_pushcclosure(L, l->func, nup);
 lua_setfield(L, t, l->name);
	}

	lua_pop(L, nup);
} /* luaL_setfuncs() */

#define luaL_newlibtable(L, l) \
	lua_createtable(L, 0, (sizeof (l) / sizeof *(l)) - 1)

#define luaL_newlib(L, l) \
	(luaL_newlibtable((L), (l)), luaL_setfuncs((L), (l), 0))

#ifndef LUA_FILEHANDLE /* Not defined by earlier LuaJIT releases */
#define LUA_FILEHANDLE "FILE*"
#endif

/*
 * Lua 5.1 userdata is a simple FILE *, while LuaJIT is a struct with the
 * first member a FILE *, similar to Lua 5.2.
 */
typedef struct luaL_Stream {
	FILE *f;
} luaL_Stream;

static int luaL_fileresult(lua_State *L, int stat, const char *filename) {
	int en = errno; /* calls to Lua API may change this value */
	if (stat) {
 lua_pushboolean(L, 1);
 return 1;
	}
	else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
	}
}

static int pushresult (lua_State *L, int i, const char *filename) {
 int en = errno; /* calls to Lua API may change this value */
 if (i) {
 lua_pushboolean(L, 1);
 return 1;
 }
 else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
 }
#define isclosed(p) ((p)->f == NULL)
#define markclosed(p) ((p)->f = NULL)

#else

#define isclosed(p) ((p)->closef == NULL)
#define markclosed(p) ((p)->closef = NULL)

#endif

#define tolstream(L) ((luaL_Stream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))

static FILE *tofile (lua_State *L) {
	luaL_Stream *p = tolstream(L);
	if (isclosed(p))
 luaL_error(L, "attempt to use a closed file");
	return p->f;
}

static int io_fclose (lua_State *L) {
 FILE **p = topfile(L);
 int ok = (fclose(*p) == 0);
 *p = NULL;
 return pushresult(L, ok, NULL);
static int io_fclose (lua_State *L)
{
	luaL_Stream *p = tolstream(L);
	int res = fclose(p->f);
	markclosed(p);
	return luaL_fileresult(L, (res == 0), NULL);
}

static FILE **newfile_fd(lua_State *L, int fd, const char *mode)
static luaL_Stream *newfile_fd(lua_State *L, int fd, const char *mode)
{
FILE **pf = (FILE **)lua_newuserdata(L, sizeof(FILE *));
*pf = NULL; /* file handle is currently `closed' */
luaL_Stream *p = (luaL_Stream *) lua_newuserdata(L, sizeof(luaL_Stream));
markclosed(p);
	luaL_getmetatable(L, LUA_FILEHANDLE);
	lua_setmetatable(L, -2);
	*pf = fdopen(fd, mode);
	return pf;
	p->f = fdopen(fd, mode);
#if LUA_VERSION_NUM >= 502
	p->closef = &io_fclose;
#endif
	return p;
}

static int lpc_run(lua_State *L)
Expand All@@ -64,12 +115,12 @@ static int lpc_run(lua_State *L)
	int p_in[2];
	int pid;

	if (pipe(p_out) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_in) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_out) == -1) goto err_noclose;
	if (pipe(p_in) == -1) goto err_closeout;
	if ((pid = fork()) == -1)	goto err_closeinout;

	if ((pid = fork()) == -1) { lua_pushnil(L); return 1; }
	else if (pid == 0)
	{
	if (pid == 0) {
 /* child */
 char **args;
 int n = lua_gettop(L); /* number of arguments */
 int i;
Expand All@@ -93,20 +144,24 @@ static int lpc_run(lua_State *L)
 _exit(1);
 return 0;
	}
	else
	{
 FILE **in;
 FILE **out;

 /* Cleanup */
 close(p_out[0]);
 close(p_in[1]);

 lua_pushnumber(L, pid);
 out = newfile_fd(L, p_out[1], "w");
 in = newfile_fd(L, p_in[0], "r");
 return 3;
	}
	/* Cleanup */
	close(p_out[0]);
	close(p_in[1]);
	lua_pushnumber(L, pid);
	newfile_fd(L, p_out[1], "w");
	newfile_fd(L, p_in[0], "r");
	return 3;

err_closeinout:
	close(p_in[0]);
	close(p_in[1]);
err_closeout:
	close(p_out[0]);
	close(p_out[1]);
err_noclose:
	lua_pushnil(L);
	return 1;
}

static int lpc_wait(lua_State *L)
Expand All@@ -116,13 +171,9 @@ static int lpc_wait(lua_State *L)
	int nonblock = luaL_optinteger(L, 2, 0);

	if (waitpid(pid, &ret, (nonblock == 1) ? WNOHANG : 0) == pid)
	{
 lua_pushnumber(L, ret);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -141,13 +192,9 @@ static int f_readable(lua_State *L)
	FD_SET(fileno(f), &rfds);
	retval = select(1 + fileno(f), &rfds, NULL, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -166,13 +213,9 @@ static int f_writable(lua_State *L)
	FD_SET(fileno(f), &wfds);
	retval = select(1 + fileno(f), NULL, &wfds, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushboolean(L, 0);
	}
	return 1;
}

Expand All@@ -192,7 +235,7 @@ static void set_info (lua_State *L)
	lua_settable (L, -3);
}

static const struct luaL_reg lpclib[] =
static const struct luaL_Reg lpclib[] =
{
	{"run", lpc_run},
	{"wait", lpc_wait},
Expand All@@ -207,15 +250,15 @@ static const luaL_Reg io_add_flib[] = {

static void createmeta(lua_State *L)
{
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
 luaL_register(L, NULL, io_add_flib); /* file methods */
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
	luaL_setfuncs(L, io_add_flib, 0); /* file methods */
}


int luaopen_lpc (lua_State *L)
{
	createmeta(L);

#if LUA_VERSION_NUM < 502
	luaL_openlib(L, "lpc", lpclib, 0);

	/* create environment for 'run' */
Expand All@@ -225,6 +268,9 @@ int luaopen_lpc (lua_State *L)
	lua_setfield(L, -2, "__close");
	lua_setfenv(L, -2);
	lua_pop(L, 1); /* pop 'run' */
#else
	luaL_newlib(L, lpclib);
#endif

	set_info(L);
	return 1;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Nov 20, 2020. It is now read-only.

lua5.2 support and fd leak fixed if pipe() or fork() fails#1
 Open

fabled
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


lua5.2 support and fd leak fixed if pipe() or fork() fails
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 9 additions & 5 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
LUA_PREFIX = /usr/local/
PREFIX	= /usr/local/
LUA_PKGCONF ?= lua

MODULE = lpc
VERSION = 1.0.0

INSTALL_PREFIX = $(PREFIX)/lib/lua/5.1/
ifneq ($(shell pkg-config $(LUA_PKGCONF) || echo not-installed),)
$(error $(LUA_PKGCONF).pc not found)
endif

INSTALL_PREFIX = $(DESTDIR)$(shell pkg-config $(LUA_PKGCONF) --variable=INSTALL_CMOD)

CC	= gcc
TARGET	= lpc.so
OBJS	= lpc.o
LIBS	=
CFLAGS	= -I $(LUA_PREFIX)/include -fPIC
LDFLAGS	= -shared -fPIC
CFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --cflags) -fPIC
LDFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --libs) -shared -fPIC

default: $(TARGET)

Expand Down

178 changes: 112 additions & 66 deletions
lpc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
/*
** LuaProcessCall
** Copyright DarkGod 2007
**
** lua 5.1/5.2 compat (c) 2014 Timo Teräs
*/

#include <errno.h>
Expand All@@ -15,47 +15,98 @@
#include "lauxlib.h"
#include "lualib.h"

#define topfile(L)	((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE))
#if LUA_VERSION_NUM < 502

static FILE *tofile (lua_State *L) {
 FILE **f = topfile(L);
 if (*f == NULL)
 luaL_error(L, "attempt to use a closed file");
 return *f;
static int lua_absindex(lua_State *L, int idx) {
	return (idx > 0 || idx <= LUA_REGISTRYINDEX)? idx : lua_gettop(L) + idx + 1;
} /* lua_absindex() */

static void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
	int i, t = lua_absindex(L, -1 - nup);

	for (; l->name; l++) {
 for (i = 0; i < nup; i++)
 lua_pushvalue(L, -nup);
 lua_pushcclosure(L, l->func, nup);
 lua_setfield(L, t, l->name);
	}

	lua_pop(L, nup);
} /* luaL_setfuncs() */

#define luaL_newlibtable(L, l) \
	lua_createtable(L, 0, (sizeof (l) / sizeof *(l)) - 1)

#define luaL_newlib(L, l) \
	(luaL_newlibtable((L), (l)), luaL_setfuncs((L), (l), 0))

#ifndef LUA_FILEHANDLE /* Not defined by earlier LuaJIT releases */
#define LUA_FILEHANDLE "FILE*"
#endif

/*
 * Lua 5.1 userdata is a simple FILE *, while LuaJIT is a struct with the
 * first member a FILE *, similar to Lua 5.2.
 */
typedef struct luaL_Stream {
	FILE *f;
} luaL_Stream;

static int luaL_fileresult(lua_State *L, int stat, const char *filename) {
	int en = errno; /* calls to Lua API may change this value */
	if (stat) {
 lua_pushboolean(L, 1);
 return 1;
	}
	else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
	}
}

static int pushresult (lua_State *L, int i, const char *filename) {
 int en = errno; /* calls to Lua API may change this value */
 if (i) {
 lua_pushboolean(L, 1);
 return 1;
 }
 else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
 }
#define isclosed(p) ((p)->f == NULL)
#define markclosed(p) ((p)->f = NULL)

#else

#define isclosed(p) ((p)->closef == NULL)
#define markclosed(p) ((p)->closef = NULL)

#endif

#define tolstream(L) ((luaL_Stream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))

static FILE *tofile (lua_State *L) {
	luaL_Stream *p = tolstream(L);
	if (isclosed(p))
 luaL_error(L, "attempt to use a closed file");
	return p->f;
}

static int io_fclose (lua_State *L) {
 FILE **p = topfile(L);
 int ok = (fclose(*p) == 0);
 *p = NULL;
 return pushresult(L, ok, NULL);
static int io_fclose (lua_State *L)
{
	luaL_Stream *p = tolstream(L);
	int res = fclose(p->f);
	markclosed(p);
	return luaL_fileresult(L, (res == 0), NULL);
}

static FILE **newfile_fd(lua_State *L, int fd, const char *mode)
static luaL_Stream *newfile_fd(lua_State *L, int fd, const char *mode)
{
FILE **pf = (FILE **)lua_newuserdata(L, sizeof(FILE *));
*pf = NULL; /* file handle is currently `closed' */
luaL_Stream *p = (luaL_Stream *) lua_newuserdata(L, sizeof(luaL_Stream));
markclosed(p);
	luaL_getmetatable(L, LUA_FILEHANDLE);
	lua_setmetatable(L, -2);
	*pf = fdopen(fd, mode);
	return pf;
	p->f = fdopen(fd, mode);
#if LUA_VERSION_NUM >= 502
	p->closef = &io_fclose;
#endif
	return p;
}

static int lpc_run(lua_State *L)
Expand All@@ -64,12 +115,12 @@ static int lpc_run(lua_State *L)
	int p_in[2];
	int pid;

	if (pipe(p_out) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_in) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_out) == -1) goto err_noclose;
	if (pipe(p_in) == -1) goto err_closeout;
	if ((pid = fork()) == -1)	goto err_closeinout;

	if ((pid = fork()) == -1) { lua_pushnil(L); return 1; }
	else if (pid == 0)
	{
	if (pid == 0) {
 /* child */
 char **args;
 int n = lua_gettop(L); /* number of arguments */
 int i;
Expand All@@ -93,20 +144,24 @@ static int lpc_run(lua_State *L)
 _exit(1);
 return 0;
	}
	else
	{
 FILE **in;
 FILE **out;

 /* Cleanup */
 close(p_out[0]);
 close(p_in[1]);

 lua_pushnumber(L, pid);
 out = newfile_fd(L, p_out[1], "w");
 in = newfile_fd(L, p_in[0], "r");
 return 3;
	}
	/* Cleanup */
	close(p_out[0]);
	close(p_in[1]);
	lua_pushnumber(L, pid);
	newfile_fd(L, p_out[1], "w");
	newfile_fd(L, p_in[0], "r");
	return 3;

err_closeinout:
	close(p_in[0]);
	close(p_in[1]);
err_closeout:
	close(p_out[0]);
	close(p_out[1]);
err_noclose:
	lua_pushnil(L);
	return 1;
}

static int lpc_wait(lua_State *L)
Expand All@@ -116,13 +171,9 @@ static int lpc_wait(lua_State *L)
	int nonblock = luaL_optinteger(L, 2, 0);

	if (waitpid(pid, &ret, (nonblock == 1) ? WNOHANG : 0) == pid)
	{
 lua_pushnumber(L, ret);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -141,13 +192,9 @@ static int f_readable(lua_State *L)
	FD_SET(fileno(f), &rfds);
	retval = select(1 + fileno(f), &rfds, NULL, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -166,13 +213,9 @@ static int f_writable(lua_State *L)
	FD_SET(fileno(f), &wfds);
	retval = select(1 + fileno(f), NULL, &wfds, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushboolean(L, 0);
	}
	return 1;
}

Expand All@@ -192,7 +235,7 @@ static void set_info (lua_State *L)
	lua_settable (L, -3);
}

static const struct luaL_reg lpclib[] =
static const struct luaL_Reg lpclib[] =
{
	{"run", lpc_run},
	{"wait", lpc_wait},
Expand All@@ -207,15 +250,15 @@ static const luaL_Reg io_add_flib[] = {

static void createmeta(lua_State *L)
{
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
 luaL_register(L, NULL, io_add_flib); /* file methods */
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
	luaL_setfuncs(L, io_add_flib, 0); /* file methods */
}


int luaopen_lpc (lua_State *L)
{
	createmeta(L);

#if LUA_VERSION_NUM < 502
	luaL_openlib(L, "lpc", lpclib, 0);

	/* create environment for 'run' */
Expand All@@ -225,6 +268,9 @@ int luaopen_lpc (lua_State *L)
	lua_setfield(L, -2, "__close");
	lua_setfenv(L, -2);
	lua_pop(L, 1); /* pop 'run' */
#else
	luaL_newlib(L, lpclib);
#endif

	set_info(L);
	return 1;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Nov 20, 2020. It is now read-only.

lua5.2 support and fd leak fixed if pipe() or fork() fails#1
 Open

fabled
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


lua5.2 support and fd leak fixed if pipe() or fork() fails
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 9 additions & 5 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
LUA_PREFIX = /usr/local/
PREFIX	= /usr/local/
LUA_PKGCONF ?= lua

MODULE = lpc
VERSION = 1.0.0

INSTALL_PREFIX = $(PREFIX)/lib/lua/5.1/
ifneq ($(shell pkg-config $(LUA_PKGCONF) || echo not-installed),)
$(error $(LUA_PKGCONF).pc not found)
endif

INSTALL_PREFIX = $(DESTDIR)$(shell pkg-config $(LUA_PKGCONF) --variable=INSTALL_CMOD)

CC	= gcc
TARGET	= lpc.so
OBJS	= lpc.o
LIBS	=
CFLAGS	= -I $(LUA_PREFIX)/include -fPIC
LDFLAGS	= -shared -fPIC
CFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --cflags) -fPIC
LDFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --libs) -shared -fPIC

default: $(TARGET)

Expand Down

178 changes: 112 additions & 66 deletions
lpc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
/*
** LuaProcessCall
** Copyright DarkGod 2007
**
** lua 5.1/5.2 compat (c) 2014 Timo Teräs
*/

#include <errno.h>
Expand All@@ -15,47 +15,98 @@
#include "lauxlib.h"
#include "lualib.h"

#define topfile(L)	((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE))
#if LUA_VERSION_NUM < 502

static FILE *tofile (lua_State *L) {
 FILE **f = topfile(L);
 if (*f == NULL)
 luaL_error(L, "attempt to use a closed file");
 return *f;
static int lua_absindex(lua_State *L, int idx) {
	return (idx > 0 || idx <= LUA_REGISTRYINDEX)? idx : lua_gettop(L) + idx + 1;
} /* lua_absindex() */

static void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
	int i, t = lua_absindex(L, -1 - nup);

	for (; l->name; l++) {
 for (i = 0; i < nup; i++)
 lua_pushvalue(L, -nup);
 lua_pushcclosure(L, l->func, nup);
 lua_setfield(L, t, l->name);
	}

	lua_pop(L, nup);
} /* luaL_setfuncs() */

#define luaL_newlibtable(L, l) \
	lua_createtable(L, 0, (sizeof (l) / sizeof *(l)) - 1)

#define luaL_newlib(L, l) \
	(luaL_newlibtable((L), (l)), luaL_setfuncs((L), (l), 0))

#ifndef LUA_FILEHANDLE /* Not defined by earlier LuaJIT releases */
#define LUA_FILEHANDLE "FILE*"
#endif

/*
 * Lua 5.1 userdata is a simple FILE *, while LuaJIT is a struct with the
 * first member a FILE *, similar to Lua 5.2.
 */
typedef struct luaL_Stream {
	FILE *f;
} luaL_Stream;

static int luaL_fileresult(lua_State *L, int stat, const char *filename) {
	int en = errno; /* calls to Lua API may change this value */
	if (stat) {
 lua_pushboolean(L, 1);
 return 1;
	}
	else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
	}
}

static int pushresult (lua_State *L, int i, const char *filename) {
 int en = errno; /* calls to Lua API may change this value */
 if (i) {
 lua_pushboolean(L, 1);
 return 1;
 }
 else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
 }
#define isclosed(p) ((p)->f == NULL)
#define markclosed(p) ((p)->f = NULL)

#else

#define isclosed(p) ((p)->closef == NULL)
#define markclosed(p) ((p)->closef = NULL)

#endif

#define tolstream(L) ((luaL_Stream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))

static FILE *tofile (lua_State *L) {
	luaL_Stream *p = tolstream(L);
	if (isclosed(p))
 luaL_error(L, "attempt to use a closed file");
	return p->f;
}

static int io_fclose (lua_State *L) {
 FILE **p = topfile(L);
 int ok = (fclose(*p) == 0);
 *p = NULL;
 return pushresult(L, ok, NULL);
static int io_fclose (lua_State *L)
{
	luaL_Stream *p = tolstream(L);
	int res = fclose(p->f);
	markclosed(p);
	return luaL_fileresult(L, (res == 0), NULL);
}

static FILE **newfile_fd(lua_State *L, int fd, const char *mode)
static luaL_Stream *newfile_fd(lua_State *L, int fd, const char *mode)
{
FILE **pf = (FILE **)lua_newuserdata(L, sizeof(FILE *));
*pf = NULL; /* file handle is currently `closed' */
luaL_Stream *p = (luaL_Stream *) lua_newuserdata(L, sizeof(luaL_Stream));
markclosed(p);
	luaL_getmetatable(L, LUA_FILEHANDLE);
	lua_setmetatable(L, -2);
	*pf = fdopen(fd, mode);
	return pf;
	p->f = fdopen(fd, mode);
#if LUA_VERSION_NUM >= 502
	p->closef = &io_fclose;
#endif
	return p;
}

static int lpc_run(lua_State *L)
Expand All@@ -64,12 +115,12 @@ static int lpc_run(lua_State *L)
	int p_in[2];
	int pid;

	if (pipe(p_out) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_in) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_out) == -1) goto err_noclose;
	if (pipe(p_in) == -1) goto err_closeout;
	if ((pid = fork()) == -1)	goto err_closeinout;

	if ((pid = fork()) == -1) { lua_pushnil(L); return 1; }
	else if (pid == 0)
	{
	if (pid == 0) {
 /* child */
 char **args;
 int n = lua_gettop(L); /* number of arguments */
 int i;
Expand All@@ -93,20 +144,24 @@ static int lpc_run(lua_State *L)
 _exit(1);
 return 0;
	}
	else
	{
 FILE **in;
 FILE **out;

 /* Cleanup */
 close(p_out[0]);
 close(p_in[1]);

 lua_pushnumber(L, pid);
 out = newfile_fd(L, p_out[1], "w");
 in = newfile_fd(L, p_in[0], "r");
 return 3;
	}
	/* Cleanup */
	close(p_out[0]);
	close(p_in[1]);
	lua_pushnumber(L, pid);
	newfile_fd(L, p_out[1], "w");
	newfile_fd(L, p_in[0], "r");
	return 3;

err_closeinout:
	close(p_in[0]);
	close(p_in[1]);
err_closeout:
	close(p_out[0]);
	close(p_out[1]);
err_noclose:
	lua_pushnil(L);
	return 1;
}

static int lpc_wait(lua_State *L)
Expand All@@ -116,13 +171,9 @@ static int lpc_wait(lua_State *L)
	int nonblock = luaL_optinteger(L, 2, 0);

	if (waitpid(pid, &ret, (nonblock == 1) ? WNOHANG : 0) == pid)
	{
 lua_pushnumber(L, ret);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -141,13 +192,9 @@ static int f_readable(lua_State *L)
	FD_SET(fileno(f), &rfds);
	retval = select(1 + fileno(f), &rfds, NULL, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -166,13 +213,9 @@ static int f_writable(lua_State *L)
	FD_SET(fileno(f), &wfds);
	retval = select(1 + fileno(f), NULL, &wfds, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushboolean(L, 0);
	}
	return 1;
}

Expand All@@ -192,7 +235,7 @@ static void set_info (lua_State *L)
	lua_settable (L, -3);
}

static const struct luaL_reg lpclib[] =
static const struct luaL_Reg lpclib[] =
{
	{"run", lpc_run},
	{"wait", lpc_wait},
Expand All@@ -207,15 +250,15 @@ static const luaL_Reg io_add_flib[] = {

static void createmeta(lua_State *L)
{
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
 luaL_register(L, NULL, io_add_flib); /* file methods */
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
	luaL_setfuncs(L, io_add_flib, 0); /* file methods */
}


int luaopen_lpc (lua_State *L)
{
	createmeta(L);

#if LUA_VERSION_NUM < 502
	luaL_openlib(L, "lpc", lpclib, 0);

	/* create environment for 'run' */
Expand All@@ -225,6 +268,9 @@ int luaopen_lpc (lua_State *L)
	lua_setfield(L, -2, "__close");
	lua_setfenv(L, -2);
	lua_pop(L, 1); /* pop 'run' */
#else
	luaL_newlib(L, lpclib);
#endif

	set_info(L);
	return 1;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Nov 20, 2020. It is now read-only.

lua5.2 support and fd leak fixed if pipe() or fork() fails#1
 Open

fabled
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


lua5.2 support and fd leak fixed if pipe() or fork() fails
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 9 additions & 5 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
LUA_PREFIX = /usr/local/
PREFIX	= /usr/local/
LUA_PKGCONF ?= lua

MODULE = lpc
VERSION = 1.0.0

INSTALL_PREFIX = $(PREFIX)/lib/lua/5.1/
ifneq ($(shell pkg-config $(LUA_PKGCONF) || echo not-installed),)
$(error $(LUA_PKGCONF).pc not found)
endif

INSTALL_PREFIX = $(DESTDIR)$(shell pkg-config $(LUA_PKGCONF) --variable=INSTALL_CMOD)

CC	= gcc
TARGET	= lpc.so
OBJS	= lpc.o
LIBS	=
CFLAGS	= -I $(LUA_PREFIX)/include -fPIC
LDFLAGS	= -shared -fPIC
CFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --cflags) -fPIC
LDFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --libs) -shared -fPIC

default: $(TARGET)

Expand Down

178 changes: 112 additions & 66 deletions
lpc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
/*
** LuaProcessCall
** Copyright DarkGod 2007
**
** lua 5.1/5.2 compat (c) 2014 Timo Teräs
*/

#include <errno.h>
Expand All@@ -15,47 +15,98 @@
#include "lauxlib.h"
#include "lualib.h"

#define topfile(L)	((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE))
#if LUA_VERSION_NUM < 502

static FILE *tofile (lua_State *L) {
 FILE **f = topfile(L);
 if (*f == NULL)
 luaL_error(L, "attempt to use a closed file");
 return *f;
static int lua_absindex(lua_State *L, int idx) {
	return (idx > 0 || idx <= LUA_REGISTRYINDEX)? idx : lua_gettop(L) + idx + 1;
} /* lua_absindex() */

static void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
	int i, t = lua_absindex(L, -1 - nup);

	for (; l->name; l++) {
 for (i = 0; i < nup; i++)
 lua_pushvalue(L, -nup);
 lua_pushcclosure(L, l->func, nup);
 lua_setfield(L, t, l->name);
	}

	lua_pop(L, nup);
} /* luaL_setfuncs() */

#define luaL_newlibtable(L, l) \
	lua_createtable(L, 0, (sizeof (l) / sizeof *(l)) - 1)

#define luaL_newlib(L, l) \
	(luaL_newlibtable((L), (l)), luaL_setfuncs((L), (l), 0))

#ifndef LUA_FILEHANDLE /* Not defined by earlier LuaJIT releases */
#define LUA_FILEHANDLE "FILE*"
#endif

/*
 * Lua 5.1 userdata is a simple FILE *, while LuaJIT is a struct with the
 * first member a FILE *, similar to Lua 5.2.
 */
typedef struct luaL_Stream {
	FILE *f;
} luaL_Stream;

static int luaL_fileresult(lua_State *L, int stat, const char *filename) {
	int en = errno; /* calls to Lua API may change this value */
	if (stat) {
 lua_pushboolean(L, 1);
 return 1;
	}
	else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
	}
}

static int pushresult (lua_State *L, int i, const char *filename) {
 int en = errno; /* calls to Lua API may change this value */
 if (i) {
 lua_pushboolean(L, 1);
 return 1;
 }
 else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
 }
#define isclosed(p) ((p)->f == NULL)
#define markclosed(p) ((p)->f = NULL)

#else

#define isclosed(p) ((p)->closef == NULL)
#define markclosed(p) ((p)->closef = NULL)

#endif

#define tolstream(L) ((luaL_Stream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))

static FILE *tofile (lua_State *L) {
	luaL_Stream *p = tolstream(L);
	if (isclosed(p))
 luaL_error(L, "attempt to use a closed file");
	return p->f;
}

static int io_fclose (lua_State *L) {
 FILE **p = topfile(L);
 int ok = (fclose(*p) == 0);
 *p = NULL;
 return pushresult(L, ok, NULL);
static int io_fclose (lua_State *L)
{
	luaL_Stream *p = tolstream(L);
	int res = fclose(p->f);
	markclosed(p);
	return luaL_fileresult(L, (res == 0), NULL);
}

static FILE **newfile_fd(lua_State *L, int fd, const char *mode)
static luaL_Stream *newfile_fd(lua_State *L, int fd, const char *mode)
{
FILE **pf = (FILE **)lua_newuserdata(L, sizeof(FILE *));
*pf = NULL; /* file handle is currently `closed' */
luaL_Stream *p = (luaL_Stream *) lua_newuserdata(L, sizeof(luaL_Stream));
markclosed(p);
	luaL_getmetatable(L, LUA_FILEHANDLE);
	lua_setmetatable(L, -2);
	*pf = fdopen(fd, mode);
	return pf;
	p->f = fdopen(fd, mode);
#if LUA_VERSION_NUM >= 502
	p->closef = &io_fclose;
#endif
	return p;
}

static int lpc_run(lua_State *L)
Expand All@@ -64,12 +115,12 @@ static int lpc_run(lua_State *L)
	int p_in[2];
	int pid;

	if (pipe(p_out) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_in) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_out) == -1) goto err_noclose;
	if (pipe(p_in) == -1) goto err_closeout;
	if ((pid = fork()) == -1)	goto err_closeinout;

	if ((pid = fork()) == -1) { lua_pushnil(L); return 1; }
	else if (pid == 0)
	{
	if (pid == 0) {
 /* child */
 char **args;
 int n = lua_gettop(L); /* number of arguments */
 int i;
Expand All@@ -93,20 +144,24 @@ static int lpc_run(lua_State *L)
 _exit(1);
 return 0;
	}
	else
	{
 FILE **in;
 FILE **out;

 /* Cleanup */
 close(p_out[0]);
 close(p_in[1]);

 lua_pushnumber(L, pid);
 out = newfile_fd(L, p_out[1], "w");
 in = newfile_fd(L, p_in[0], "r");
 return 3;
	}
	/* Cleanup */
	close(p_out[0]);
	close(p_in[1]);
	lua_pushnumber(L, pid);
	newfile_fd(L, p_out[1], "w");
	newfile_fd(L, p_in[0], "r");
	return 3;

err_closeinout:
	close(p_in[0]);
	close(p_in[1]);
err_closeout:
	close(p_out[0]);
	close(p_out[1]);
err_noclose:
	lua_pushnil(L);
	return 1;
}

static int lpc_wait(lua_State *L)
Expand All@@ -116,13 +171,9 @@ static int lpc_wait(lua_State *L)
	int nonblock = luaL_optinteger(L, 2, 0);

	if (waitpid(pid, &ret, (nonblock == 1) ? WNOHANG : 0) == pid)
	{
 lua_pushnumber(L, ret);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -141,13 +192,9 @@ static int f_readable(lua_State *L)
	FD_SET(fileno(f), &rfds);
	retval = select(1 + fileno(f), &rfds, NULL, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -166,13 +213,9 @@ static int f_writable(lua_State *L)
	FD_SET(fileno(f), &wfds);
	retval = select(1 + fileno(f), NULL, &wfds, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushboolean(L, 0);
	}
	return 1;
}

Expand All@@ -192,7 +235,7 @@ static void set_info (lua_State *L)
	lua_settable (L, -3);
}

static const struct luaL_reg lpclib[] =
static const struct luaL_Reg lpclib[] =
{
	{"run", lpc_run},
	{"wait", lpc_wait},
Expand All@@ -207,15 +250,15 @@ static const luaL_Reg io_add_flib[] = {

static void createmeta(lua_State *L)
{
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
 luaL_register(L, NULL, io_add_flib); /* file methods */
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
	luaL_setfuncs(L, io_add_flib, 0); /* file methods */
}


int luaopen_lpc (lua_State *L)
{
	createmeta(L);

#if LUA_VERSION_NUM < 502
	luaL_openlib(L, "lpc", lpclib, 0);

	/* create environment for 'run' */
Expand All@@ -225,6 +268,9 @@ int luaopen_lpc (lua_State *L)
	lua_setfield(L, -2, "__close");
	lua_setfenv(L, -2);
	lua_pop(L, 1); /* pop 'run' */
#else
	luaL_newlib(L, lpclib);
#endif

	set_info(L);
	return 1;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Nov 20, 2020. It is now read-only.

lua5.2 support and fd leak fixed if pipe() or fork() fails#1
 Open

fabled
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


lua5.2 support and fd leak fixed if pipe() or fork() fails
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 9 additions & 5 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
LUA_PREFIX = /usr/local/
PREFIX	= /usr/local/
LUA_PKGCONF ?= lua

MODULE = lpc
VERSION = 1.0.0

INSTALL_PREFIX = $(PREFIX)/lib/lua/5.1/
ifneq ($(shell pkg-config $(LUA_PKGCONF) || echo not-installed),)
$(error $(LUA_PKGCONF).pc not found)
endif

INSTALL_PREFIX = $(DESTDIR)$(shell pkg-config $(LUA_PKGCONF) --variable=INSTALL_CMOD)

CC	= gcc
TARGET	= lpc.so
OBJS	= lpc.o
LIBS	=
CFLAGS	= -I $(LUA_PREFIX)/include -fPIC
LDFLAGS	= -shared -fPIC
CFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --cflags) -fPIC
LDFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --libs) -shared -fPIC

default: $(TARGET)

Expand Down

178 changes: 112 additions & 66 deletions
lpc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
/*
** LuaProcessCall
** Copyright DarkGod 2007
**
** lua 5.1/5.2 compat (c) 2014 Timo Teräs
*/

#include <errno.h>
Expand All@@ -15,47 +15,98 @@
#include "lauxlib.h"
#include "lualib.h"

#define topfile(L)	((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE))
#if LUA_VERSION_NUM < 502

static FILE *tofile (lua_State *L) {
 FILE **f = topfile(L);
 if (*f == NULL)
 luaL_error(L, "attempt to use a closed file");
 return *f;
static int lua_absindex(lua_State *L, int idx) {
	return (idx > 0 || idx <= LUA_REGISTRYINDEX)? idx : lua_gettop(L) + idx + 1;
} /* lua_absindex() */

static void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
	int i, t = lua_absindex(L, -1 - nup);

	for (; l->name; l++) {
 for (i = 0; i < nup; i++)
 lua_pushvalue(L, -nup);
 lua_pushcclosure(L, l->func, nup);
 lua_setfield(L, t, l->name);
	}

	lua_pop(L, nup);
} /* luaL_setfuncs() */

#define luaL_newlibtable(L, l) \
	lua_createtable(L, 0, (sizeof (l) / sizeof *(l)) - 1)

#define luaL_newlib(L, l) \
	(luaL_newlibtable((L), (l)), luaL_setfuncs((L), (l), 0))

#ifndef LUA_FILEHANDLE /* Not defined by earlier LuaJIT releases */
#define LUA_FILEHANDLE "FILE*"
#endif

/*
 * Lua 5.1 userdata is a simple FILE *, while LuaJIT is a struct with the
 * first member a FILE *, similar to Lua 5.2.
 */
typedef struct luaL_Stream {
	FILE *f;
} luaL_Stream;

static int luaL_fileresult(lua_State *L, int stat, const char *filename) {
	int en = errno; /* calls to Lua API may change this value */
	if (stat) {
 lua_pushboolean(L, 1);
 return 1;
	}
	else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
	}
}

static int pushresult (lua_State *L, int i, const char *filename) {
 int en = errno; /* calls to Lua API may change this value */
 if (i) {
 lua_pushboolean(L, 1);
 return 1;
 }
 else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
 }
#define isclosed(p) ((p)->f == NULL)
#define markclosed(p) ((p)->f = NULL)

#else

#define isclosed(p) ((p)->closef == NULL)
#define markclosed(p) ((p)->closef = NULL)

#endif

#define tolstream(L) ((luaL_Stream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))

static FILE *tofile (lua_State *L) {
	luaL_Stream *p = tolstream(L);
	if (isclosed(p))
 luaL_error(L, "attempt to use a closed file");
	return p->f;
}

static int io_fclose (lua_State *L) {
 FILE **p = topfile(L);
 int ok = (fclose(*p) == 0);
 *p = NULL;
 return pushresult(L, ok, NULL);
static int io_fclose (lua_State *L)
{
	luaL_Stream *p = tolstream(L);
	int res = fclose(p->f);
	markclosed(p);
	return luaL_fileresult(L, (res == 0), NULL);
}

static FILE **newfile_fd(lua_State *L, int fd, const char *mode)
static luaL_Stream *newfile_fd(lua_State *L, int fd, const char *mode)
{
FILE **pf = (FILE **)lua_newuserdata(L, sizeof(FILE *));
*pf = NULL; /* file handle is currently `closed' */
luaL_Stream *p = (luaL_Stream *) lua_newuserdata(L, sizeof(luaL_Stream));
markclosed(p);
	luaL_getmetatable(L, LUA_FILEHANDLE);
	lua_setmetatable(L, -2);
	*pf = fdopen(fd, mode);
	return pf;
	p->f = fdopen(fd, mode);
#if LUA_VERSION_NUM >= 502
	p->closef = &io_fclose;
#endif
	return p;
}

static int lpc_run(lua_State *L)
Expand All@@ -64,12 +115,12 @@ static int lpc_run(lua_State *L)
	int p_in[2];
	int pid;

	if (pipe(p_out) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_in) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_out) == -1) goto err_noclose;
	if (pipe(p_in) == -1) goto err_closeout;
	if ((pid = fork()) == -1)	goto err_closeinout;

	if ((pid = fork()) == -1) { lua_pushnil(L); return 1; }
	else if (pid == 0)
	{
	if (pid == 0) {
 /* child */
 char **args;
 int n = lua_gettop(L); /* number of arguments */
 int i;
Expand All@@ -93,20 +144,24 @@ static int lpc_run(lua_State *L)
 _exit(1);
 return 0;
	}
	else
	{
 FILE **in;
 FILE **out;

 /* Cleanup */
 close(p_out[0]);
 close(p_in[1]);

 lua_pushnumber(L, pid);
 out = newfile_fd(L, p_out[1], "w");
 in = newfile_fd(L, p_in[0], "r");
 return 3;
	}
	/* Cleanup */
	close(p_out[0]);
	close(p_in[1]);
	lua_pushnumber(L, pid);
	newfile_fd(L, p_out[1], "w");
	newfile_fd(L, p_in[0], "r");
	return 3;

err_closeinout:
	close(p_in[0]);
	close(p_in[1]);
err_closeout:
	close(p_out[0]);
	close(p_out[1]);
err_noclose:
	lua_pushnil(L);
	return 1;
}

static int lpc_wait(lua_State *L)
Expand All@@ -116,13 +171,9 @@ static int lpc_wait(lua_State *L)
	int nonblock = luaL_optinteger(L, 2, 0);

	if (waitpid(pid, &ret, (nonblock == 1) ? WNOHANG : 0) == pid)
	{
 lua_pushnumber(L, ret);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -141,13 +192,9 @@ static int f_readable(lua_State *L)
	FD_SET(fileno(f), &rfds);
	retval = select(1 + fileno(f), &rfds, NULL, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -166,13 +213,9 @@ static int f_writable(lua_State *L)
	FD_SET(fileno(f), &wfds);
	retval = select(1 + fileno(f), NULL, &wfds, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushboolean(L, 0);
	}
	return 1;
}

Expand All@@ -192,7 +235,7 @@ static void set_info (lua_State *L)
	lua_settable (L, -3);
}

static const struct luaL_reg lpclib[] =
static const struct luaL_Reg lpclib[] =
{
	{"run", lpc_run},
	{"wait", lpc_wait},
Expand All@@ -207,15 +250,15 @@ static const luaL_Reg io_add_flib[] = {

static void createmeta(lua_State *L)
{
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
 luaL_register(L, NULL, io_add_flib); /* file methods */
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
	luaL_setfuncs(L, io_add_flib, 0); /* file methods */
}


int luaopen_lpc (lua_State *L)
{
	createmeta(L);

#if LUA_VERSION_NUM < 502
	luaL_openlib(L, "lpc", lpclib, 0);

	/* create environment for 'run' */
Expand All@@ -225,6 +268,9 @@ int luaopen_lpc (lua_State *L)
	lua_setfield(L, -2, "__close");
	lua_setfenv(L, -2);
	lua_pop(L, 1); /* pop 'run' */
#else
	luaL_newlib(L, lpclib);
#endif

	set_info(L);
	return 1;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Nov 20, 2020. It is now read-only.

lua5.2 support and fd leak fixed if pipe() or fork() fails#1
 Open

fabled
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


lua5.2 support and fd leak fixed if pipe() or fork() fails
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 9 additions & 5 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
LUA_PREFIX = /usr/local/
PREFIX	= /usr/local/
LUA_PKGCONF ?= lua

MODULE = lpc
VERSION = 1.0.0

INSTALL_PREFIX = $(PREFIX)/lib/lua/5.1/
ifneq ($(shell pkg-config $(LUA_PKGCONF) || echo not-installed),)
$(error $(LUA_PKGCONF).pc not found)
endif

INSTALL_PREFIX = $(DESTDIR)$(shell pkg-config $(LUA_PKGCONF) --variable=INSTALL_CMOD)

CC	= gcc
TARGET	= lpc.so
OBJS	= lpc.o
LIBS	=
CFLAGS	= -I $(LUA_PREFIX)/include -fPIC
LDFLAGS	= -shared -fPIC
CFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --cflags) -fPIC
LDFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --libs) -shared -fPIC

default: $(TARGET)

Expand Down

178 changes: 112 additions & 66 deletions
lpc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
/*
** LuaProcessCall
** Copyright DarkGod 2007
**
** lua 5.1/5.2 compat (c) 2014 Timo Teräs
*/

#include <errno.h>
Expand All@@ -15,47 +15,98 @@
#include "lauxlib.h"
#include "lualib.h"

#define topfile(L)	((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE))
#if LUA_VERSION_NUM < 502

static FILE *tofile (lua_State *L) {
 FILE **f = topfile(L);
 if (*f == NULL)
 luaL_error(L, "attempt to use a closed file");
 return *f;
static int lua_absindex(lua_State *L, int idx) {
	return (idx > 0 || idx <= LUA_REGISTRYINDEX)? idx : lua_gettop(L) + idx + 1;
} /* lua_absindex() */

static void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
	int i, t = lua_absindex(L, -1 - nup);

	for (; l->name; l++) {
 for (i = 0; i < nup; i++)
 lua_pushvalue(L, -nup);
 lua_pushcclosure(L, l->func, nup);
 lua_setfield(L, t, l->name);
	}

	lua_pop(L, nup);
} /* luaL_setfuncs() */

#define luaL_newlibtable(L, l) \
	lua_createtable(L, 0, (sizeof (l) / sizeof *(l)) - 1)

#define luaL_newlib(L, l) \
	(luaL_newlibtable((L), (l)), luaL_setfuncs((L), (l), 0))

#ifndef LUA_FILEHANDLE /* Not defined by earlier LuaJIT releases */
#define LUA_FILEHANDLE "FILE*"
#endif

/*
 * Lua 5.1 userdata is a simple FILE *, while LuaJIT is a struct with the
 * first member a FILE *, similar to Lua 5.2.
 */
typedef struct luaL_Stream {
	FILE *f;
} luaL_Stream;

static int luaL_fileresult(lua_State *L, int stat, const char *filename) {
	int en = errno; /* calls to Lua API may change this value */
	if (stat) {
 lua_pushboolean(L, 1);
 return 1;
	}
	else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
	}
}

static int pushresult (lua_State *L, int i, const char *filename) {
 int en = errno; /* calls to Lua API may change this value */
 if (i) {
 lua_pushboolean(L, 1);
 return 1;
 }
 else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
 }
#define isclosed(p) ((p)->f == NULL)
#define markclosed(p) ((p)->f = NULL)

#else

#define isclosed(p) ((p)->closef == NULL)
#define markclosed(p) ((p)->closef = NULL)

#endif

#define tolstream(L) ((luaL_Stream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))

static FILE *tofile (lua_State *L) {
	luaL_Stream *p = tolstream(L);
	if (isclosed(p))
 luaL_error(L, "attempt to use a closed file");
	return p->f;
}

static int io_fclose (lua_State *L) {
 FILE **p = topfile(L);
 int ok = (fclose(*p) == 0);
 *p = NULL;
 return pushresult(L, ok, NULL);
static int io_fclose (lua_State *L)
{
	luaL_Stream *p = tolstream(L);
	int res = fclose(p->f);
	markclosed(p);
	return luaL_fileresult(L, (res == 0), NULL);
}

static FILE **newfile_fd(lua_State *L, int fd, const char *mode)
static luaL_Stream *newfile_fd(lua_State *L, int fd, const char *mode)
{
FILE **pf = (FILE **)lua_newuserdata(L, sizeof(FILE *));
*pf = NULL; /* file handle is currently `closed' */
luaL_Stream *p = (luaL_Stream *) lua_newuserdata(L, sizeof(luaL_Stream));
markclosed(p);
	luaL_getmetatable(L, LUA_FILEHANDLE);
	lua_setmetatable(L, -2);
	*pf = fdopen(fd, mode);
	return pf;
	p->f = fdopen(fd, mode);
#if LUA_VERSION_NUM >= 502
	p->closef = &io_fclose;
#endif
	return p;
}

static int lpc_run(lua_State *L)
Expand All@@ -64,12 +115,12 @@ static int lpc_run(lua_State *L)
	int p_in[2];
	int pid;

	if (pipe(p_out) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_in) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_out) == -1) goto err_noclose;
	if (pipe(p_in) == -1) goto err_closeout;
	if ((pid = fork()) == -1)	goto err_closeinout;

	if ((pid = fork()) == -1) { lua_pushnil(L); return 1; }
	else if (pid == 0)
	{
	if (pid == 0) {
 /* child */
 char **args;
 int n = lua_gettop(L); /* number of arguments */
 int i;
Expand All@@ -93,20 +144,24 @@ static int lpc_run(lua_State *L)
 _exit(1);
 return 0;
	}
	else
	{
 FILE **in;
 FILE **out;

 /* Cleanup */
 close(p_out[0]);
 close(p_in[1]);

 lua_pushnumber(L, pid);
 out = newfile_fd(L, p_out[1], "w");
 in = newfile_fd(L, p_in[0], "r");
 return 3;
	}
	/* Cleanup */
	close(p_out[0]);
	close(p_in[1]);
	lua_pushnumber(L, pid);
	newfile_fd(L, p_out[1], "w");
	newfile_fd(L, p_in[0], "r");
	return 3;

err_closeinout:
	close(p_in[0]);
	close(p_in[1]);
err_closeout:
	close(p_out[0]);
	close(p_out[1]);
err_noclose:
	lua_pushnil(L);
	return 1;
}

static int lpc_wait(lua_State *L)
Expand All@@ -116,13 +171,9 @@ static int lpc_wait(lua_State *L)
	int nonblock = luaL_optinteger(L, 2, 0);

	if (waitpid(pid, &ret, (nonblock == 1) ? WNOHANG : 0) == pid)
	{
 lua_pushnumber(L, ret);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -141,13 +192,9 @@ static int f_readable(lua_State *L)
	FD_SET(fileno(f), &rfds);
	retval = select(1 + fileno(f), &rfds, NULL, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -166,13 +213,9 @@ static int f_writable(lua_State *L)
	FD_SET(fileno(f), &wfds);
	retval = select(1 + fileno(f), NULL, &wfds, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushboolean(L, 0);
	}
	return 1;
}

Expand All@@ -192,7 +235,7 @@ static void set_info (lua_State *L)
	lua_settable (L, -3);
}

static const struct luaL_reg lpclib[] =
static const struct luaL_Reg lpclib[] =
{
	{"run", lpc_run},
	{"wait", lpc_wait},
Expand All@@ -207,15 +250,15 @@ static const luaL_Reg io_add_flib[] = {

static void createmeta(lua_State *L)
{
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
 luaL_register(L, NULL, io_add_flib); /* file methods */
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
	luaL_setfuncs(L, io_add_flib, 0); /* file methods */
}


int luaopen_lpc (lua_State *L)
{
	createmeta(L);

#if LUA_VERSION_NUM < 502
	luaL_openlib(L, "lpc", lpclib, 0);

	/* create environment for 'run' */
Expand All@@ -225,6 +268,9 @@ int luaopen_lpc (lua_State *L)
	lua_setfield(L, -2, "__close");
	lua_setfenv(L, -2);
	lua_pop(L, 1); /* pop 'run' */
#else
	luaL_newlib(L, lpclib);
#endif

	set_info(L);
	return 1;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Nov 20, 2020. It is now read-only.

lua5.2 support and fd leak fixed if pipe() or fork() fails#1
 Open

fabled
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


lua5.2 support and fd leak fixed if pipe() or fork() fails
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 9 additions & 5 deletions
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
LUA_PREFIX = /usr/local/
PREFIX	= /usr/local/
LUA_PKGCONF ?= lua

MODULE = lpc
VERSION = 1.0.0

INSTALL_PREFIX = $(PREFIX)/lib/lua/5.1/
ifneq ($(shell pkg-config $(LUA_PKGCONF) || echo not-installed),)
$(error $(LUA_PKGCONF).pc not found)
endif

INSTALL_PREFIX = $(DESTDIR)$(shell pkg-config $(LUA_PKGCONF) --variable=INSTALL_CMOD)

CC	= gcc
TARGET	= lpc.so
OBJS	= lpc.o
LIBS	=
CFLAGS	= -I $(LUA_PREFIX)/include -fPIC
LDFLAGS	= -shared -fPIC
CFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --cflags) -fPIC
LDFLAGS	= $(shell pkg-config $(LUA_PKGCONF) --libs) -shared -fPIC

default: $(TARGET)

Expand Down

178 changes: 112 additions & 66 deletions
lpc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
/*
** LuaProcessCall
** Copyright DarkGod 2007
**
** lua 5.1/5.2 compat (c) 2014 Timo Teräs
*/

#include <errno.h>
Expand All@@ -15,47 +15,98 @@
#include "lauxlib.h"
#include "lualib.h"

#define topfile(L)	((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE))
#if LUA_VERSION_NUM < 502

static FILE *tofile (lua_State *L) {
 FILE **f = topfile(L);
 if (*f == NULL)
 luaL_error(L, "attempt to use a closed file");
 return *f;
static int lua_absindex(lua_State *L, int idx) {
	return (idx > 0 || idx <= LUA_REGISTRYINDEX)? idx : lua_gettop(L) + idx + 1;
} /* lua_absindex() */

static void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
	int i, t = lua_absindex(L, -1 - nup);

	for (; l->name; l++) {
 for (i = 0; i < nup; i++)
 lua_pushvalue(L, -nup);
 lua_pushcclosure(L, l->func, nup);
 lua_setfield(L, t, l->name);
	}

	lua_pop(L, nup);
} /* luaL_setfuncs() */

#define luaL_newlibtable(L, l) \
	lua_createtable(L, 0, (sizeof (l) / sizeof *(l)) - 1)

#define luaL_newlib(L, l) \
	(luaL_newlibtable((L), (l)), luaL_setfuncs((L), (l), 0))

#ifndef LUA_FILEHANDLE /* Not defined by earlier LuaJIT releases */
#define LUA_FILEHANDLE "FILE*"
#endif

/*
 * Lua 5.1 userdata is a simple FILE *, while LuaJIT is a struct with the
 * first member a FILE *, similar to Lua 5.2.
 */
typedef struct luaL_Stream {
	FILE *f;
} luaL_Stream;

static int luaL_fileresult(lua_State *L, int stat, const char *filename) {
	int en = errno; /* calls to Lua API may change this value */
	if (stat) {
 lua_pushboolean(L, 1);
 return 1;
	}
	else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
	}
}

static int pushresult (lua_State *L, int i, const char *filename) {
 int en = errno; /* calls to Lua API may change this value */
 if (i) {
 lua_pushboolean(L, 1);
 return 1;
 }
 else {
 lua_pushnil(L);
 if (filename)
 lua_pushfstring(L, "%s: %s", filename, strerror(en));
 else
 lua_pushfstring(L, "%s", strerror(en));
 lua_pushinteger(L, en);
 return 3;
 }
#define isclosed(p) ((p)->f == NULL)
#define markclosed(p) ((p)->f = NULL)

#else

#define isclosed(p) ((p)->closef == NULL)
#define markclosed(p) ((p)->closef = NULL)

#endif

#define tolstream(L) ((luaL_Stream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))

static FILE *tofile (lua_State *L) {
	luaL_Stream *p = tolstream(L);
	if (isclosed(p))
 luaL_error(L, "attempt to use a closed file");
	return p->f;
}

static int io_fclose (lua_State *L) {
 FILE **p = topfile(L);
 int ok = (fclose(*p) == 0);
 *p = NULL;
 return pushresult(L, ok, NULL);
static int io_fclose (lua_State *L)
{
	luaL_Stream *p = tolstream(L);
	int res = fclose(p->f);
	markclosed(p);
	return luaL_fileresult(L, (res == 0), NULL);
}

static FILE **newfile_fd(lua_State *L, int fd, const char *mode)
static luaL_Stream *newfile_fd(lua_State *L, int fd, const char *mode)
{
FILE **pf = (FILE **)lua_newuserdata(L, sizeof(FILE *));
*pf = NULL; /* file handle is currently `closed' */
luaL_Stream *p = (luaL_Stream *) lua_newuserdata(L, sizeof(luaL_Stream));
markclosed(p);
	luaL_getmetatable(L, LUA_FILEHANDLE);
	lua_setmetatable(L, -2);
	*pf = fdopen(fd, mode);
	return pf;
	p->f = fdopen(fd, mode);
#if LUA_VERSION_NUM >= 502
	p->closef = &io_fclose;
#endif
	return p;
}

static int lpc_run(lua_State *L)
Expand All@@ -64,12 +115,12 @@ static int lpc_run(lua_State *L)
	int p_in[2];
	int pid;

	if (pipe(p_out) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_in) == -1) { lua_pushnil(L); return 1; }
	if (pipe(p_out) == -1) goto err_noclose;
	if (pipe(p_in) == -1) goto err_closeout;
	if ((pid = fork()) == -1)	goto err_closeinout;

	if ((pid = fork()) == -1) { lua_pushnil(L); return 1; }
	else if (pid == 0)
	{
	if (pid == 0) {
 /* child */
 char **args;
 int n = lua_gettop(L); /* number of arguments */
 int i;
Expand All@@ -93,20 +144,24 @@ static int lpc_run(lua_State *L)
 _exit(1);
 return 0;
	}
	else
	{
 FILE **in;
 FILE **out;

 /* Cleanup */
 close(p_out[0]);
 close(p_in[1]);

 lua_pushnumber(L, pid);
 out = newfile_fd(L, p_out[1], "w");
 in = newfile_fd(L, p_in[0], "r");
 return 3;
	}
	/* Cleanup */
	close(p_out[0]);
	close(p_in[1]);
	lua_pushnumber(L, pid);
	newfile_fd(L, p_out[1], "w");
	newfile_fd(L, p_in[0], "r");
	return 3;

err_closeinout:
	close(p_in[0]);
	close(p_in[1]);
err_closeout:
	close(p_out[0]);
	close(p_out[1]);
err_noclose:
	lua_pushnil(L);
	return 1;
}

static int lpc_wait(lua_State *L)
Expand All@@ -116,13 +171,9 @@ static int lpc_wait(lua_State *L)
	int nonblock = luaL_optinteger(L, 2, 0);

	if (waitpid(pid, &ret, (nonblock == 1) ? WNOHANG : 0) == pid)
	{
 lua_pushnumber(L, ret);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -141,13 +192,9 @@ static int f_readable(lua_State *L)
	FD_SET(fileno(f), &rfds);
	retval = select(1 + fileno(f), &rfds, NULL, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushnil(L);
	}
	return 1;
}

Expand All@@ -166,13 +213,9 @@ static int f_writable(lua_State *L)
	FD_SET(fileno(f), &wfds);
	retval = select(1 + fileno(f), NULL, &wfds, NULL, &tv);
	if (retval == 1)
	{
 lua_pushboolean(L, 1);
	}
	else
	{
 lua_pushboolean(L, 0);
	}
	return 1;
}

Expand All@@ -192,7 +235,7 @@ static void set_info (lua_State *L)
	lua_settable (L, -3);
}

static const struct luaL_reg lpclib[] =
static const struct luaL_Reg lpclib[] =
{
	{"run", lpc_run},
	{"wait", lpc_wait},
Expand All@@ -207,15 +250,15 @@ static const luaL_Reg io_add_flib[] = {

static void createmeta(lua_State *L)
{
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
 luaL_register(L, NULL, io_add_flib); /* file methods */
luaL_getmetatable(L, LUA_FILEHANDLE); /* get IO's metatable for file handles */
	luaL_setfuncs(L, io_add_flib, 0); /* file methods */
}


int luaopen_lpc (lua_State *L)
{
	createmeta(L);

#if LUA_VERSION_NUM < 502
	luaL_openlib(L, "lpc", lpclib, 0);

	/* create environment for 'run' */
Expand All@@ -225,6 +268,9 @@ int luaopen_lpc (lua_State *L)
	lua_setfield(L, -2, "__close");
	lua_setfenv(L, -2);
	lua_pop(L, 1); /* pop 'run' */
#else
	luaL_newlib(L, lpclib);
#endif

	set_info(L);
	return 1;
Expand Down