fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 00:50:50 +00:00
Code Issues Projects Releases Wiki Activity

Actually use the protectClient() API where needed.

Browse Source 
Related to #4804.
This commit is contained in:
antirez 2018-10-09 13:18:25 +02:00
parent 69c30965eb
commit 929c686cce
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/debug.c
View File

@ -345,9 +345,9 @@ NULL
return;
}
emptyDb(-1,EMPTYDB_NO_FLAGS,NULL);
aeDeleteFileEvent(server.el,c->fd,AE_READABLE);
protectClient(c);
int ret = rdbLoad(server.rdb_filename,NULL);
aeCreateFileEvent(server.el,c->fd,AE_READABLE,readQueryFromClient,c);
unprotectClient(c);
if (ret != C_OK) {
addReplyError(c,"Error trying to load the RDB dump");
return;
@ -357,9 +357,9 @@ NULL
} else if (!strcasecmp(c->argv[1]->ptr,"loadaof")) {
if (server.aof_state != AOF_OFF) flushAppendOnlyFile(1);
emptyDb(-1,EMPTYDB_NO_FLAGS,NULL);
aeDeleteFileEvent(server.el,c->fd,AE_READABLE);
protectClient(c);
int ret = loadAppendOnlyFile(server.aof_filename);
aeCreateFileEvent(server.el,c->fd,AE_READABLE,readQueryFromClient,c);
unprotectClient(c);
if (ret != C_OK) {
addReply(c,shared.err);
return;

9
src/scripting.c
View File

@ -1242,7 +1242,7 @@ void luaMaskCountHook(lua_State *lua, lua_Debug *ar) {
* we need to mask the client executing the script from the event loop.
* If we don't do that the client may disconnect and could no longer be
* here when the EVAL command will return. */
aeDeleteFileEvent(server.el, server.lua_caller->fd, AE_READABLE);
protectClient(server.lua_caller);
}
if (server.lua_timedout) processEventsWhileBlocked();
if (server.lua_kill) {
@ -1370,10 +1370,9 @@ void evalGenericCommand(client *c, int evalsha) {
if (delhook) lua_sethook(lua,NULL,0,0); /* Disable hook */
if (server.lua_timedout) {
server.lua_timedout = 0;
/* Restore the readable handler that was unregistered when the
* script timeout was detected. */
aeCreateFileEvent(server.el,c->fd,AE_READABLE,
readQueryFromClient,c);
/* Restore the client that was protected when the script timeout
* was detected. */
unprotectClient(c);
if (server.masterhost && server.master)
queueClientForReprocessing(server.master);
}