Skip to content
Snippets Groups Projects
Commit be516634 authored by Luigi Scarso's avatar Luigi Scarso
Browse files

Patch for lj_prng.c if O_CLOEXEC is not defined.

parent 7c07c1db
No related branches found
No related tags found
No related merge requests found
Showing with 29 additions and 1 deletion
......@@ -227,7 +227,11 @@ int LJ_FASTCALL lj_prng_seed_secure(PRNGState *rs)
** or the OS ran out of file descriptors.
*/
{
#ifdef O_CLOEXEC
int fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC);
#else
int fd = open("/dev/urandom", O_RDONLY);
#endif
if (fd != -1) {
ssize_t n = read(fd, rs->u, sizeof(rs->u));
(void)close(fd);
......
diff -bu a/source/libs/luajit/LuaJIT-src/src/lauxlib.h b/source/libs/luajit/LuaJIT-src/src/lauxlib.h
--- a/source/libs/luajit/LuaJIT-src/src/lauxlib.h
+++ b/source/libs/luajit/LuaJIT-src/src/lauxlib.h
@@ -93,6 +93,31 @@
......
diff -bu a/source/libs/luajit/LuaJIT-src/src/lib_init.c b/source/libs/luajit/LuaJIT-src/src/lib_init.c
--- a/source/libs/luajit/LuaJIT-src/src/lib_init.c
+++ b/source/libs/luajit/LuaJIT-src/src/lib_init.c
@@ -26,6 +26,7 @@
......
diff -bu a/source/libs/luajit/LuaJIT-src/src/lib_package.c b/source/libs/luajit/LuaJIT-src/src/lib_package.c
--- a/source/libs/luajit/LuaJIT-src/src/lib_package.c
+++ b/source/libs/luajit/LuaJIT-src/src/lib_package.c
@@ -378,6 +378,29 @@
......
diff -bu a/source/libs/luajit/LuaJIT-src/src/lj_arch.h b/source/libs/luajit/LuaJIT-src/src/lj_arch.h
--- a/source/libs/luajit/LuaJIT-src/src/lj_arch.h
+++ b/source/libs/luajit/LuaJIT-src/src/lj_arch.h
@@ -455,7 +455,7 @@
......
diff -bu a/source/libs/luajit/LuaJIT-src/src/lj_def.h b/source/libs/luajit/LuaJIT-src/src/lj_def.h
--- a/source/libs/luajit/LuaJIT-src/src/lj_def.h
+++ b/source/libs/luajit/LuaJIT-src/src/lj_def.h
@@ -66,7 +66,7 @@
......
diff -bu a/source/libs/luajit/LuaJIT-src/src/lj_load.c b/source/libs/luajit/LuaJIT-src/src/lj_load.c
--- a/source/libs/luajit/LuaJIT-src/src/lj_load.c
+++ b/source/libs/luajit/LuaJIT-src/src/lj_load.c
@@ -182,3 +182,32 @@
......
diff -bu a/source/libs/luajit/LuaJIT-src/src/lj_prng.c b/source/libs/luajit/LuaJIT-src/src/lj_prng.c
--- a/source/libs/luajit/LuaJIT-src/src/lj_prng.c
+++ b/source/libs/luajit/LuaJIT-src/src/lj_prng.c
@@ -227,7 +227,11 @@
** or the OS ran out of file descriptors.
*/
{
+#ifdef O_CLOEXEC
int fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC);
+#else
+ int fd = open("/dev/urandom", O_RDONLY);
+#endif
if (fd != -1) {
ssize_t n = read(fd, rs->u, sizeof(rs->u));
(void)close(fd);
diff -bu a/source/libs/luajit/LuaJIT-src/src/lj_str.c b/source/libs/luajit/LuaJIT-src/src/lj_str.c
--- a/source/libs/luajit/LuaJIT-src/src/lj_str.c
+++ b/source/libs/luajit/LuaJIT-src/src/lj_str.c
@@ -310,6 +310,7 @@
......
diff -bu a/source/libs/luajit/LuaJIT-src/src/lua.h b/source/libs/luajit/LuaJIT-src/src/lua.h
--- a/source/libs/luajit/LuaJIT-src/src/lua.h
+++ b/source/libs/luajit/LuaJIT-src/src/lua.h
@@ -104,6 +104,9 @@
......
diff -bu a/source/libs/luajit/LuaJIT-src/src/lualib.h b/source/libs/luajit/LuaJIT-src/src/lualib.h
--- a/source/libs/luajit/LuaJIT-src/src/lualib.h
+++ b/source/libs/luajit/LuaJIT-src/src/lualib.h
@@ -22,6 +22,8 @@
......
#ifndef luatex_svn_revision_h
#define luatex_svn_revision_h
#define luatex_svn_revision 7652
#define luatex_svn_revision 7653
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment