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

Fix out of bounds memory access in Buffer:setArrayData with matrices.

Browse Source 
Issue #1986
This commit is contained in:
Sasha Szpakowski
2023-12-31 16:32:12 -04:00
parent d7e0856dc6
commit 9b537ede2b
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/wrap_Buffer.cpp
+20 -9
View File
@@ -66,6 +66,17 @@ static inline size_t writeUNormData(lua_State *L, int startidx, int components,
return sizeof(T) * components; return sizeof(T) * components;
} }
template <typename T>
static inline size_t writeDataRequired(lua_State *L, int startidx, int components, char *data)
{
auto componentdata = (T*)data;
for (int i = 0; i < components; i++)
componentdata[i] = (T)(luaL_checknumber(L, startidx + i));
return sizeof(T) * components;
}
void luax_writebufferdata(lua_State *L, int startidx, DataFormat format, char *data) void luax_writebufferdata(lua_State *L, int startidx, DataFormat format, char *data)
{ {
switch (format) switch (format)
@@ -75,17 +86,17 @@ void luax_writebufferdata(lua_State *L, int startidx, DataFormat format, char *d
case DATAFORMAT_FLOAT_VEC3: writeData<float>(L, startidx, 3, data); break; case DATAFORMAT_FLOAT_VEC3: writeData<float>(L, startidx, 3, data); break;
case DATAFORMAT_FLOAT_VEC4: writeData<float>(L, startidx, 4, data); break; case DATAFORMAT_FLOAT_VEC4: writeData<float>(L, startidx, 4, data); break;
case DATAFORMAT_FLOAT_MAT2X2: writeData<float>(L, startidx, 4, data); break; case DATAFORMAT_FLOAT_MAT2X2: writeDataRequired<float>(L, startidx, 4, data); break;
case DATAFORMAT_FLOAT_MAT2X3: writeData<float>(L, startidx, 6, data); break; case DATAFORMAT_FLOAT_MAT2X3: writeDataRequired<float>(L, startidx, 6, data); break;
case DATAFORMAT_FLOAT_MAT2X4: writeData<float>(L, startidx, 8, data); break; case DATAFORMAT_FLOAT_MAT2X4: writeDataRequired<float>(L, startidx, 8, data); break;
case DATAFORMAT_FLOAT_MAT3X2: writeData<float>(L, startidx, 6, data); break; case DATAFORMAT_FLOAT_MAT3X2: writeDataRequired<float>(L, startidx, 6, data); break;
case DATAFORMAT_FLOAT_MAT3X3: writeData<float>(L, startidx, 9, data); break; case DATAFORMAT_FLOAT_MAT3X3: writeDataRequired<float>(L, startidx, 9, data); break;
case DATAFORMAT_FLOAT_MAT3X4: writeData<float>(L, startidx, 12, data); break; case DATAFORMAT_FLOAT_MAT3X4: writeDataRequired<float>(L, startidx, 12, data); break;
case DATAFORMAT_FLOAT_MAT4X2: writeData<float>(L, startidx, 8, data); break; case DATAFORMAT_FLOAT_MAT4X2: writeDataRequired<float>(L, startidx, 8, data); break;
case DATAFORMAT_FLOAT_MAT4X3: writeData<float>(L, startidx, 12, data); break; case DATAFORMAT_FLOAT_MAT4X3: writeDataRequired<float>(L, startidx, 12, data); break;
case DATAFORMAT_FLOAT_MAT4X4: writeData<float>(L, startidx, 16, data); break; case DATAFORMAT_FLOAT_MAT4X4: writeDataRequired<float>(L, startidx, 16, data); break;
case DATAFORMAT_INT32: writeData<int32>(L, startidx, 1, data); break; case DATAFORMAT_INT32: writeData<int32>(L, startidx, 1, data); break;
case DATAFORMAT_INT32_VEC2: writeData<int32>(L, startidx, 2, data); break; case DATAFORMAT_INT32_VEC2: writeData<int32>(L, startidx, 2, data); break;