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

Fix crashes when creating a Buffer.

Browse Source
This commit is contained in:
Alex Szpakowski
2020-07-21 20:50:49 -03:00
parent 77834d8e6c
commit c2be89f130
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/wrap_Graphics.cpp
+3 -6
View File
@@ -1523,10 +1523,12 @@ int w_newIndexBuffer(lua_State *L)
size_t bytesize = 0;
DataFormat format = DATAFORMAT_UINT16;
Data *data = nullptr;
const void *initialdata = nullptr;
if (luax_istype(L, 1, Data::type))
{
data = luax_checktype<Data>(L, 1);
initialdata = data->getData();
bytesize = data->getSize();
}
@@ -1565,7 +1567,7 @@ int w_newIndexBuffer(lua_State *L)
}
Buffer *b = nullptr;
luax_catchexcept(L, [&] { b = instance()->newBuffer(settings, format, nullptr, bytesize, arraylength); });
luax_catchexcept(L, [&] { b = instance()->newBuffer(settings, format, initialdata, bytesize, arraylength); });
if (lua_istable(L, 1))
{
@@ -1584,11 +1586,6 @@ int w_newIndexBuffer(lua_State *L)
u32data[i] = (uint32) v;
}
}
else if (data != nullptr)
{
Buffer::Mapper mapper(*b);
memcpy(mapper.data, data->getData(), std::min(data->getSize(), b->getSize()));
}
luax_pushtype(L, b);
b->release();