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

fix: call CLIENT INFO from redis module will crash the server (#8560)

Browse Source 
Because when the RM_Call is invoked. It will create a faker client.
The point is client connection is NULL, so server will crash in connGetInfo

Co-authored-by: Viktor Söderqvist <viktor.soderqvist@est.tech>
This commit is contained in:
Bonsai 2021-03-01 00:18:14 -06:00 committed by GitHub
parent 1bf02e1ca9
commit 81a55d026f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/connection.c
View File

@ -427,7 +427,7 @@ int connGetState(connection *conn) {
* For sockets, we always return "fd=<fdnum>" to maintain compatibility. * For sockets, we always return "fd=<fdnum>" to maintain compatibility.
*/ */
const char *connGetInfo(connection *conn, char *buf, size_t buf_len) { const char *connGetInfo(connection *conn, char *buf, size_t buf_len) {
snprintf(buf, buf_len-1, "fd=%i", conn->fd); snprintf(buf, buf_len-1, "fd=%i", conn == NULL ? -1 : conn->fd);
return buf; return buf;
} }

4
tests/unit/moduleapi/misc.tcl
View File

@ -111,4 +111,8 @@ start_server {tags {"modules"}} {
r test.log_tsctx "info" "Test message" r test.log_tsctx "info" "Test message"
verify_log_message 0 "*<misc> Test message*" 0 verify_log_message 0 "*<misc> Test message*" 0
} }
test {test RM_Call CLIENT INFO} {
assert_match "*fd=-1*" [r test.call_generic client info]
}
} }