gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Fix issue #4505, Lua RDB AUX field loading of existing scripts.

Browse Source 
Unfortunately, as outlined by @soloestoy in #4505, "lua" AUX RDB field
loading in case of duplicated script was still broken. This commit fixes
this problem and also a memory leak introduced by the past commit.

Note that now we have a regression test able to duplicate the issue, so
this commit was actually tested against the regression. The original PR
also had a valid fix, but I prefer to hide the details of scripting.c
outside scripting.c, and later "SCRIPT LOAD" should also be able to use
the function luaCreateFunction() instead of redoing the work.
This commit is contained in:
antirez 2017-12-04 10:33:04 +01:00
parent 6f0b19bc5b
commit 68681f2bcf
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/scripting.c
View File

@ -1161,7 +1161,6 @@ int redis_math_randomseed (lua_State *L) {
* On error C_ERR is returned and an appropriate error is set in the
* client context. */
int luaCreateFunction(client *c, lua_State *lua, char *funcname, robj *body, int allow_dup) {
sds funcdef = sdsempty();
char fname[43];
if (funcname == NULL) {
@ -1171,9 +1170,16 @@ int luaCreateFunction(client *c, lua_State *lua, char *funcname, robj *body, int
funcname = fname;
}
if (allow_dup && dictFind(server.lua_scripts,funcname+2) != NULL)
return C_OK;
if (allow_dup) {
sds sha = sdsnewlen(funcname+2,40);
if (allow_dup && dictFind(server.lua_scripts,sha) != NULL) {
sdsfree(sha);
return C_OK;
}
sdsfree(sha);
}
sds funcdef = sdsempty();
funcdef = sdscat(funcdef,"function ");
funcdef = sdscatlen(funcdef,funcname,42);
funcdef = sdscatlen(funcdef,"() ",3);