Fix secure io.lines

ShadowNinja · ShadowNinja · commit 3af5eef96463 · 2016-11-24T10:10:20.000-05:00
It used to drop all of the return values from the
insecure version of the function.
diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
@@ -577,13 +577,13 @@ int ScriptApiSecurity::sl_io_lines(lua_State *L)
 		CHECK_SECURE_PATH(L, path);
 	}
 
+	int top_precall = lua_gettop(L);
 	push_original(L, "io", "lines");
 	lua_pushvalue(L, 1);
-	int top_precall = lua_gettop(L);
 	lua_call(L, 1, LUA_MULTRET);
 	// Return number of arguments returned by the function,
 	// adjusting for the function being poped.
-	return lua_gettop(L) - (top_precall - 1);
+	return lua_gettop(L) - top_precall;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -577,13 +577,13 @@ int ScriptApiSecurity::sl_io_lines(lua_State *L)`
`577`	`577`	`CHECK_SECURE_PATH(L, path);`
`578`	`578`	`}`
`579`	`579`
	`580`	`+ int top_precall = lua_gettop(L);`
`580`	`581`	`push_original(L, "io", "lines");`
`581`	`582`	`lua_pushvalue(L, 1);`
`582`		`- int top_precall = lua_gettop(L);`
`583`	`583`	`lua_call(L, 1, LUA_MULTRET);`
`584`	`584`	`// Return number of arguments returned by the function,`
`585`	`585`	`// adjusting for the function being poped.`
`586`		`- return lua_gettop(L) - (top_precall - 1);`
	`586`	`+ return lua_gettop(L) - top_precall;`
`587`	`587`	`}`
`588`	`588`
`589`	`589`