aboutsummaryrefslogtreecommitdiff
path: root/src/lfs.c
diff options
context:
space:
mode:
authorPeter Melnichenko <mpeterval@gmail.com>2016-08-25 18:24:57 +0300
committerPeter Melnichenko <mpeterval@gmail.com>2016-08-25 18:31:09 +0300
commit50919ed69ff64df51d8d586d00834fde3e901785 (patch)
tree165f2d1bb241fd0448992d9f1b1e9e5630db64df /src/lfs.c
parent4cf702d85069db13f04b06dbe1ce4b1a0314dafc (diff)
downloadluafilesystem-50919ed69ff64df51d8d586d00834fde3e901785.tar.gz
luafilesystem-50919ed69ff64df51d8d586d00834fde3e901785.tar.bz2
luafilesystem-50919ed69ff64df51d8d586d00834fde3e901785.zip
Fix lfs.attributes and lfs.symlinkattributes extra argument handling
When the second argument is not a string, _file_info() wants to ensure that there is a table on top of the stack: the second argument or a new table. If a new table is pushed it's created on top immediately, but if a table is passed as the second argument it can be followed by extra arguments, with the last one ending up being used as a table, causing a crash. The fix is to remove any potential extra arguments using `lua_settop(L, 2)`. Also added a few tests for this case. Ref #80.
Diffstat (limited to 'src/lfs.c')
-rw-r--r--src/lfs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lfs.c b/src/lfs.c
index 93c1419..8154a46 100644
--- a/src/lfs.c
+++ b/src/lfs.c
@@ -827,7 +827,8 @@ static int _file_info_ (lua_State *L, int (*st)(const char*, STAT_STRUCT*)) {
827 /* member not found */ 827 /* member not found */
828 return luaL_error(L, "invalid attribute name '%s'", member); 828 return luaL_error(L, "invalid attribute name '%s'", member);
829 } 829 }
830 /* creates a table if none is given */ 830 /* creates a table if none is given, removes extra arguments */
831 lua_settop(L, 2);
831 if (!lua_istable (L, 2)) { 832 if (!lua_istable (L, 2)) {
832 lua_newtable (L); 833 lua_newtable (L);
833 } 834 }