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

[lua] Fix reported crash setting nil as user data (fix #4187)

Browse Source
This commit is contained in:
David Capello 2023-11-30 16:10:59 -03:00
parent 10738b32c3
commit 82375462ae
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/script/userdata.h
View File

@ -67,7 +67,7 @@ int UserData_set_text(lua_State* L) {
const char* text = lua_tostring(L, 2); const char* text = lua_tostring(L, 2);
auto wud = get_WithUserData<T>(obj); auto wud = get_WithUserData<T>(obj);
UserData ud = wud->userData(); UserData ud = wud->userData();
ud.setText(text); ud.setText(text ? std::string(text): std::string());
if (spr) { if (spr) {
Tx tx; Tx tx;
tx(new cmd::SetUserData(wud, ud, static_cast<Doc*>(spr->document()))); tx(new cmd::SetUserData(wud, ud, static_cast<Doc*>(spr->document())));

7
tests/scripts/userdata.lua
View File

@ -135,3 +135,10 @@ do
assert(spr.properties.a == "hi") assert(spr.properties.a == "hi")
assert(spr.properties.b == 60) assert(spr.properties.b == 60)
end end
-- Test crash setting nil user data
-- https://github.com/aseprite/aseprite/issues/4187
do
local spr = Sprite(1, 1)
spr.data = nil
end