fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-08 18:38:04 +00:00
Code Issues Projects Releases Wiki Activity

Prevent clients from making too large multibulk requests

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-10-15 19:15:38 +02:00
parent ea5b70924d
commit b19c33d48a
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/networking.c
View File

@ -724,6 +724,10 @@ int processMultibulkBuffer(redisClient *c) {
if (c->multibulklen <= 0) { if (c->multibulklen <= 0) {
c->querybuf = sdsrange(c->querybuf,pos,-1); c->querybuf = sdsrange(c->querybuf,pos,-1);
return REDIS_OK; return REDIS_OK;
} else if (c->multibulklen > 1024*1024) {
addReplyError(c,"Protocol error: invalid multibulk length");
setProtocolError(c,pos);
return REDIS_ERR;
} }
/* Setup argv array on client structure */ /* Setup argv array on client structure */

7
tests/unit/protocol.tcl
View File

@ -13,6 +13,13 @@ start_server {tags {"protocol"}} {
assert_equal PONG [r ping] assert_equal PONG [r ping]
} }
test "Out of range multibulk length" {
reconnect
r write "*20000000\r\n"
r flush
assert_error "*invalid multibulk length*" {r read}
}
test "Wrong multibulk payload header" { test "Wrong multibulk payload header" {
reconnect reconnect
r write "*3\r\n\$3\r\nSET\r\n\$1\r\nx\r\nfooz\r\n" r write "*3\r\n\$3\r\nSET\r\n\$1\r\nx\r\nfooz\r\n"