mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-04 05:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

lua: Fix may_get_docobj() when the object is not of the expected type

Browse Source
This commit is contained in:
David Capello 2018-11-23 14:26:29 -03:00
parent 44205c8121
commit 3211bc67b1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/script/docobj.h
View File

@ -28,12 +28,13 @@ template <typename T> void push_docobj(lua_State* L, T* obj) {
}
template <typename T> T* may_get_docobj(lua_State* L, int index) {
const doc::ObjectId id = *(doc::ObjectId*)luaL_checkudata(L, index, get_mtname<T>());
T* obj = doc::get<T>(id);
if (obj)
return obj;
else
return nullptr;
const doc::ObjectId* id = (doc::ObjectId*)luaL_testudata(L, index, get_mtname<T>());
if (id) {
T* obj = doc::get<T>(*id);
if (obj)
return obj;
}
return nullptr;
}
template <typename T> T* check_docobj(lua_State* L, T* obj) {