LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed undefined behaviour when love exceptions are converted into Lua errors (resolves issue #729)

Browse Source
This commit is contained in:
Alex Szpakowski
2013-09-05 23:17:29 -03:00
parent 389e99bf2c
commit 06f80d5c08
45 changed files with 349 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mouse/wrap_Mouse.cpp
+3 -24
View File
@@ -45,14 +45,7 @@ int w_newCursor(lua_State *L)
if (!Cursor::getConstant(str, systemCursor))
return luaL_error(L, "Invalid cursor type %s", str);
try
{
cursor = instance->newCursor(systemCursor);
}
catch (love::Exception &e)
{
return luaL_error(L, "%s", e.what());
}
EXCEPT_GUARD(cursor = instance->newCursor(systemCursor);)
}
else
{
@@ -61,14 +54,7 @@ int w_newCursor(lua_State *L)
int hotx = luaL_optint(L, 2, 0);
int hoty = luaL_optint(L, 3, 0);
try
{
cursor = instance->newCursor(data, hotx, hoty);
}
catch (love::Exception &e)
{
return luaL_error(L, "%s", e.what());
}
EXCEPT_GUARD(cursor = instance->newCursor(data, hotx, hoty);)
}
luax_pushtype(L, "Cursor", MOUSE_CURSOR_T, cursor);
@@ -223,14 +209,7 @@ extern "C" int luaopen_love_mouse(lua_State *L)
{
if (instance == 0)
{
try
{
instance = new love::mouse::sdl::Mouse();
}
catch(Exception &e)
{
return luaL_error(L, e.what());
}
EXCEPT_GUARD(instance = new love::mouse::sdl::Mouse();)
}
else
instance->retain();