rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug: invalid mode can crash 'io.popen'

This commit is contained in:
Roberto Ierusalimschy 2020-07-15 16:01:03 -03:00
parent e1d8770f12
commit 1ecfbfa1a1
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
liolib.c
View File

@ -52,6 +52,12 @@ static int l_checkmode (const char *mode) {
** ======================================================= ** =======================================================
*/ */
#if !defined(l_checkmodep)
/* By default, Lua accepts only "r" or "w" as mode */
#define l_checkmodep(m) ((m[0] == 'r' || m[0] == 'w') && m[1] == '\0')
#endif
#if !defined(l_popen) /* { */ #if !defined(l_popen) /* { */
#if defined(LUA_USE_POSIX) /* { */ #if defined(LUA_USE_POSIX) /* { */
@ -279,6 +285,7 @@ static int io_popen (lua_State *L) {
const char *filename = luaL_checkstring(L, 1); const char *filename = luaL_checkstring(L, 1);
const char *mode = luaL_optstring(L, 2, "r"); const char *mode = luaL_optstring(L, 2, "r");
LStream *p = newprefile(L); LStream *p = newprefile(L);
luaL_argcheck(L, l_checkmodep(mode), 2, "invalid mode");
p->f = l_popen(L, filename, mode); p->f = l_popen(L, filename, mode);
p->closef = &io_pclose; p->closef = &io_pclose;
return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1; return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;

15
testes/files.lua
View File

@ -721,6 +721,21 @@ if not _port then
progname = '"' .. arg[i + 1] .. '"' progname = '"' .. arg[i + 1] .. '"'
end end
print("testing popen/pclose and execute") print("testing popen/pclose and execute")
-- invalid mode for popen
checkerr("invalid mode", io.popen, "cat", "")
checkerr("invalid mode", io.popen, "cat", "r+")
checkerr("invalid mode", io.popen, "cat", "rw")
do -- basic tests for popen
local file = os.tmpname()
local f = assert(io.popen("cat - > " .. file, "w"))
f:write("a line")
assert(f:close())
local f = assert(io.popen("cat - < " .. file, "r"))
assert(f:read("a") == "a line")
assert(f:close())
assert(os.remove(file))
end
local tests = { local tests = {
-- command, what, code -- command, what, code
{"ls > /dev/null", "ok"}, {"ls > /dev/null", "ok"},