aboutsummaryrefslogtreecommitdiff
path: root/liolib.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2020-07-15 16:01:03 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2020-07-15 16:01:03 -0300
commit1ecfbfa1a1debd2258decdf7c1954ac6f9761699 (patch)
treea03e232e5c6a6c9cf6b4fe7b5b31d73a614ad26a /liolib.c
parente1d8770f12542d34a3e32b825c95b93f8a341ee1 (diff)
downloadlua-1ecfbfa1a1debd2258decdf7c1954ac6f9761699.tar.gz
lua-1ecfbfa1a1debd2258decdf7c1954ac6f9761699.tar.bz2
lua-1ecfbfa1a1debd2258decdf7c1954ac6f9761699.zip
Fixed bug: invalid mode can crash 'io.popen'
Diffstat (limited to 'liolib.c')
-rw-r--r--liolib.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/liolib.c b/liolib.c
index 7ac34443..60ab1bfa 100644
--- a/liolib.c
+++ b/liolib.c
@@ -52,6 +52,12 @@ static int l_checkmode (const char *mode) {
52** ======================================================= 52** =======================================================
53*/ 53*/
54 54
55#if !defined(l_checkmodep)
56/* By default, Lua accepts only "r" or "w" as mode */
57#define l_checkmodep(m) ((m[0] == 'r' || m[0] == 'w') && m[1] == '\0')
58#endif
59
60
55#if !defined(l_popen) /* { */ 61#if !defined(l_popen) /* { */
56 62
57#if defined(LUA_USE_POSIX) /* { */ 63#if defined(LUA_USE_POSIX) /* { */
@@ -279,6 +285,7 @@ static int io_popen (lua_State *L) {
279 const char *filename = luaL_checkstring(L, 1); 285 const char *filename = luaL_checkstring(L, 1);
280 const char *mode = luaL_optstring(L, 2, "r"); 286 const char *mode = luaL_optstring(L, 2, "r");
281 LStream *p = newprefile(L); 287 LStream *p = newprefile(L);
288 luaL_argcheck(L, l_checkmodep(mode), 2, "invalid mode");
282 p->f = l_popen(L, filename, mode); 289 p->f = l_popen(L, filename, mode);
283 p->closef = &io_pclose; 290 p->closef = &io_pclose;
284 return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1; 291 return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;