mirror
/
valkey
mirror of https://github.com/valkey-io/valkey
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix format issues with CVE fix (#2681) 

The CVE fixes had a formatting and external test issue that wasn't
caught because private branches don't run those CI steps. 

Signed-off-by: Madelyn Olson <madelyneolson@gmail.com>
This commit is contained in:
Madelyn Olson 2025-10-03 10:29:51 -07:00 committed by GitHub
parent 955a7a9f2a
commit 671947159d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lua/script_lua.c
View File

@ -1411,19 +1411,18 @@ void luaSetTableProtectionForBasicTypes(lua_State *lua) {
LUA_TNIL,
LUA_TFUNCTION,
LUA_TTHREAD,
LUA_TLIGHTUSERDATA
};
LUA_TLIGHTUSERDATA};
for (size_t i = 0; i < sizeof(types) / sizeof(types[0]); i++) {
/* Push a dummy value of the type to get its metatable */
switch (types[i]) {
case LUA_TSTRING: lua_pushstring(lua, ""); break;
case LUA_TNUMBER: lua_pushnumber(lua, 0); break;
case LUA_TBOOLEAN: lua_pushboolean(lua, 0); break;
case LUA_TNIL: lua_pushnil(lua); break;
case LUA_TFUNCTION: lua_pushcfunction(lua, NULL); break;
case LUA_TTHREAD: lua_newthread(lua); break;
case LUA_TLIGHTUSERDATA: lua_pushlightuserdata(lua, (void*)lua); break;
case LUA_TSTRING: lua_pushstring(lua, ""); break;
case LUA_TNUMBER: lua_pushnumber(lua, 0); break;
case LUA_TBOOLEAN: lua_pushboolean(lua, 0); break;
case LUA_TNIL: lua_pushnil(lua); break;
case LUA_TFUNCTION: lua_pushcfunction(lua, NULL); break;
case LUA_TTHREAD: lua_newthread(lua); break;
case LUA_TLIGHTUSERDATA: lua_pushlightuserdata(lua, (void *)lua); break;
}
if (lua_getmetatable(lua, -1)) {
luaSetTableProtectionRecursively(lua);
@ -1432,7 +1431,7 @@ void luaSetTableProtectionForBasicTypes(lua_State *lua) {
lua_pop(lua, 1); /* pop dummy value */
}
}
void luaRegisterVersion(lua_State *lua) {
/* For legacy compatibility reasons include Redis versions. */
lua_pushstring(lua, "REDIS_VERSION_NUM");

2
tests/unit/scripting.tcl
View File

@ -693,7 +693,7 @@ start_server {tags {"scripting"}} {
assert_error {*Script attempted to access nonexistent global variable 'getfenv'*} {
r eval "return getfenv()" 0
}
}
} {} {external:skip}
test {SCRIPTING FLUSH ASYNC} {
r script flush sync