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

Use a lua_type switch/case in thread.send, to prevent casts (bug #252)

Browse Source 
Push non-love userdata as lightuserdata, will probably break it, but shouldn't crash love (bug #243)
This commit is contained in:
Bart van Strien
2011-07-03 18:02:53 +02:00
parent 94ec448a1b
commit ce5927379d
2 changed files with 73 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/thread/Thread.cpp
+9 -4
View File
@@ -101,10 +101,15 @@ namespace thread
{ {
type = FUSERDATA; type = FUSERDATA;
this->udatatype = udatatype; this->udatatype = udatatype;
Proxy *p = (Proxy *) userdata; if (udatatype != INVALID_ID)
flags = p->flags; {
data.userdata = p->data; Proxy *p = (Proxy *) userdata;
((love::Object *) data.userdata)->retain(); flags = p->flags;
data.userdata = p->data;
((love::Object *) data.userdata)->retain();
}
else
data.userdata = userdata;
} }
ThreadVariant::~ThreadVariant() ThreadVariant::~ThreadVariant()
src/modules/thread/wrap_Thread.cpp
+64 -112
View File
@@ -70,18 +70,12 @@ namespace thread
return 1; return 1;
} }
int w_Thread_get(lua_State *L) bool __pushThreadVariant(lua_State *L, ThreadVariant *v)
{ {
Thread *t = luax_checkthread(L, 1);
std::string name = luax_checklstring(L, 2);
t->lock();
ThreadVariant *v = t->get(name);
t->clear(name);
t->unlock();
if (!v) if (!v)
{ {
lua_pushnil(L); lua_pushnil(L);
return 1; return false;
} }
switch(v->type) switch(v->type)
{ {
@@ -98,17 +92,36 @@ namespace thread
lua_pushlightuserdata(L, v->data.userdata); lua_pushlightuserdata(L, v->data.userdata);
break; break;
case FUSERDATA: case FUSERDATA:
{ if (v->udatatype != INVALID_ID)
const char *name = NULL; {
love::types.find(v->udatatype, name); const char *name = NULL;
((love::Object *) v->data.userdata)->retain(); love::types.find(v->udatatype, name);
luax_newtype(L, name, v->flags, v->data.userdata); ((love::Object *) v->data.userdata)->retain();
luax_newtype(L, name, v->flags, v->data.userdata);
}
else
lua_pushlightuserdata(L, v->data.userdata);
// I know this is not the same
// sadly, however, it's the most
// I can do (at the moment).
break; break;
}
default: default:
lua_pushnil(L); lua_pushnil(L);
break; break;
} }
return true;
}
int w_Thread_get(lua_State *L)
{
Thread *t = luax_checkthread(L, 1);
std::string name = luax_checklstring(L, 2);
t->lock();
ThreadVariant *v = t->get(name);
t->clear(name);
t->unlock();
if (!__pushThreadVariant(L, v))
return 1;
t->lock(); t->lock();
v->release(); v->release();
t->unlock(); t->unlock();
@@ -123,37 +136,8 @@ namespace thread
ThreadVariant *v = t->demand(name); ThreadVariant *v = t->demand(name);
t->clear(name); t->clear(name);
t->unlock(); t->unlock();
if (!v) if (!__pushThreadVariant(L, v))
{
lua_pushnil(L);
return 1; return 1;
}
switch(v->type)
{
case BOOLEAN:
lua_pushboolean(L, v->data.boolean);
break;
case NUMBER:
lua_pushnumber(L, v->data.number);
break;
case STRING:
lua_pushlstring(L, v->data.string.str, v->data.string.len);
break;
case LUSERDATA:
lua_pushlightuserdata(L, v->data.userdata);
break;
case FUSERDATA:
{
const char *name = NULL;
types.find(v->udatatype, name);
((love::Object *) v->data.userdata)->retain();
luax_newtype(L, name, v->flags, v->data.userdata);
break;
}
default:
lua_pushnil(L);
break;
}
t->lock(); t->lock();
v->release(); v->release();
t->unlock(); t->unlock();
@@ -167,37 +151,8 @@ namespace thread
t->lock(); t->lock();
ThreadVariant *v = t->get(name); ThreadVariant *v = t->get(name);
t->unlock(); t->unlock();
if (!v) if (!__pushThreadVariant(L, v))
{
lua_pushnil(L);
return 1; return 1;
}
switch(v->type)
{
case BOOLEAN:
lua_pushboolean(L, v->data.boolean);
break;
case NUMBER:
lua_pushnumber(L, v->data.number);
break;
case STRING:
lua_pushlstring(L, v->data.string.str, v->data.string.len);
break;
case LUSERDATA:
lua_pushlightuserdata(L, v->data.userdata);
break;
case FUSERDATA:
{
const char *name = NULL;
types.find(v->udatatype, name);
((love::Object *) v->data.userdata)->retain();
luax_newtype(L, name, v->flags, v->data.userdata);
break;
}
default:
lua_pushnil(L);
break;
}
t->lock(); t->lock();
v->release(); v->release();
t->unlock(); t->unlock();
@@ -205,51 +160,48 @@ namespace thread
} }
Type extractudatatype(lua_State * L, int idx) Type extractudatatype(lua_State * L, int idx)
{ {
Type t = INVALID_ID; Type t = INVALID_ID;
if (!lua_isuserdata(L, idx)) if (!lua_isuserdata(L, idx))
return t; return t;
if (luaL_getmetafield (L, idx, "__tostring") == 0) if (luaL_getmetafield (L, idx, "__tostring") == 0)
return t; return t;
lua_pushvalue(L, idx); lua_pushvalue(L, idx);
int result = lua_pcall(L, 1, 1, 0); int result = lua_pcall(L, 1, 1, 0);
if (result == 0) if (result == 0)
types.find(lua_tostring(L, -1), t); types.find(lua_tostring(L, -1), t);
if (result == 0 || result == LUA_ERRRUN) if (result == 0 || result == LUA_ERRRUN)
lua_pop(L, 1); lua_pop(L, 1);
return t; return t;
} }
int w_Thread_set(lua_State *L) int w_Thread_set(lua_State *L)
{ {
Thread *t = luax_checkthread(L, 1); Thread *t = luax_checkthread(L, 1);
std::string name = luax_checklstring(L, 2); std::string name = luax_checklstring(L, 2);
ThreadVariant *v; ThreadVariant *v;
if (lua_isboolean(L, 3)) size_t len;
const char *str;
switch(lua_type(L, 3))
{ {
v = new ThreadVariant(luax_toboolean(L, 3)); case LUA_TBOOLEAN:
} v = new ThreadVariant(luax_toboolean(L, 3));
else if (lua_isnumber(L, 3)) break;
{ case LUA_TNUMBER:
v = new ThreadVariant(lua_tonumber(L, 3)); v = new ThreadVariant(lua_tonumber(L, 3));
} break;
else if (lua_isstring(L, 3)) case LUA_TSTRING:
{ str = lua_tolstring(L, 3, &len);
size_t len; v = new ThreadVariant(str, len);
const char *str = lua_tolstring(L, 3, &len); break;
v = new ThreadVariant(str, len); case LUA_TLIGHTUSERDATA:
} v = new ThreadVariant(lua_touserdata(L, 3));
else if (lua_islightuserdata(L, 3)) break;
{ case LUA_TUSERDATA:
v = new ThreadVariant(lua_touserdata(L, 3)); v = new ThreadVariant(extractudatatype(L, 3), lua_touserdata(L, 3));
} break;
else if (lua_isuserdata(L, 3)) default:
{ return luaL_error(L, "Expected boolean, number, string or userdata");
v = new ThreadVariant(extractudatatype(L, 3), lua_touserdata(L, 3));
}
else
{
return luaL_error(L, "Expected boolean, number, string or userdata");
} }
t->set(name, v); t->set(name, v);
v->release(); v->release();