summaryrefslogtreecommitdiff
path: root/src/conversion.rs
diff options
context:
space:
mode:
authorkyren <kerriganw@gmail.com>2017-06-25 16:52:32 -0400
committerkyren <kerriganw@gmail.com>2017-06-25 17:15:11 -0400
commitd3b311fe49e6d88798982f8d6281b7300b84eec1 (patch)
tree60211e51ef28a705a8004259b6b2d25cf120ae4e /src/conversion.rs
parentbf9bf849c2a03768eb9b9609893ea3a75c8d2bcd (diff)
downloadmlua-d3b311fe49e6d88798982f8d6281b7300b84eec1.zip
Another major API change, out of stack space is not an Err
It, ahem "should not" be possible to exhaust lua stack space in normal usage, and causing stack errors to be Err is slightly obnoxious. I have been wanting to make this change for a while, and removing the callback API from tables makes this sensible *I think*. I can think of a couple of ways that this is not technically true, but I think that they are acceptable, or should be handled differently. One, you can make arbitrarily sized LuaVariadic values. I think this is maybe a bug already, because there is an argument limit in Lua which is lower than the stack limit. I'm not sure what happens there, but if it is a stack based panic, (or any panic?) it is a bug. Two, I believe that if you recurse over and over between lua -> rust -> lua -> rust etc, and call rlua API functions, you might get a stack panic. I think for trusted lua code, this is morally equivalent to a regular stack overflow in plain rust, which is already.. well it's not a panic but it's some kind of safe crash I'm not sure, so I think this is acceptable. For *untrusted* lua code, this could theoretically be a problem if the API provided a callback that would call back into lua, then some lua script could force a stack based panic. There are so many concerns with untrusted lua code, and this library is NOT safe enough yet for untrusted code (it doesn't even provide an option to limit lua to the safe API subset yet!), so this is not currently an issue. When the library provides support for "safe lua", it should come with big warnings anyway, and being able to force a stack panic is pretty minor in comparison. I think if there are other ways to cause unbounded stack usage, that it is a bug, or there can be an error just for that situation, like argument count limits. This commit also fixes several stupid bugs with tests, stack checking, and panics.
Diffstat (limited to 'src/conversion.rs')
-rw-r--r--src/conversion.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/conversion.rs b/src/conversion.rs
index 15edf6b..7a65597 100644
--- a/src/conversion.rs
+++ b/src/conversion.rs
@@ -98,7 +98,7 @@ impl<'lua> FromLua<'lua> for LuaUserData<'lua> {
impl<'lua, T: LuaUserDataType> ToLua<'lua> for T {
fn to_lua(self, lua: &'lua Lua) -> LuaResult<LuaValue<'lua>> {
- lua.create_userdata(self).map(LuaValue::UserData)
+ Ok(LuaValue::UserData(lua.create_userdata(self)))
}
}
@@ -167,7 +167,7 @@ impl<'lua> FromLua<'lua> for LightUserData {
impl<'lua> ToLua<'lua> for String {
fn to_lua(self, lua: &'lua Lua) -> LuaResult<LuaValue<'lua>> {
- Ok(LuaValue::String(lua.create_string(&self)?))
+ Ok(LuaValue::String(lua.create_string(&self)))
}
}
@@ -179,7 +179,7 @@ impl<'lua> FromLua<'lua> for String {
impl<'lua, 'a> ToLua<'lua> for &'a str {
fn to_lua(self, lua: &'lua Lua) -> LuaResult<LuaValue<'lua>> {
- Ok(LuaValue::String(lua.create_string(self)?))
+ Ok(LuaValue::String(lua.create_string(self)))
}
}