fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-25 10:32:14 +00:00
Code Issues Projects Releases Wiki Activity

Read bulk reply length in one pass.

Browse Source 
See issue #1699.
This commit is contained in:
antirez 2014-04-22 19:00:23 +02:00
parent 20c040d364
commit 09bb817d1a
1 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/networking.c
View File

@ -997,35 +997,58 @@ int processMultibulkBuffer(redisClient *c) {
while(c->multibulklen) { while(c->multibulklen) {
/* Read bulk length if unknown */ /* Read bulk length if unknown */
if (c->bulklen == -1) { if (c->bulklen == -1) {
newline = strchr(c->querybuf+pos,'\r'); char *p = c->querybuf+pos;
if (newline == NULL) {
if (sdslen(c->querybuf) > REDIS_INLINE_MAX_SIZE) { /* Parse $<num>\r\n. Note that we can be certain that
addReplyError(c,"Protocol error: too big bulk count string"); * there is either a "\r" if the protcol is correct and
setProtocolError(c,0); * the bulk header is complete, or "\0" (because of sds.c API
* that gurantees null-term) if no "\r" is encountered. */
if (*p != '$') {
if (*p == '\0') {
break;
} else {
addReplyErrorFormat(c,
"Protocol error: expected '$', got '%c'", *p);
setProtocolError(c, p - c->querybuf);
return REDIS_ERR;
} }
break; }
p++; /* Skip $ */
/* Parse the number. */
ll = 0;
while(*p >= '0' && *p <= '9') {
ll *= 10;
ll += *p - '0';
p++;
} }
/* Buffer should also contain \n */ if (*p != '\r') {
if (newline-(c->querybuf) > ((signed)sdslen(c->querybuf)-2)) if (*p == '\0') { /* No complete bulk header found. */
break; if (sdslen(c->querybuf) > REDIS_INLINE_MAX_SIZE) {
addReplyError(c,
if (c->querybuf[pos] != '$') { "Protocol error: too big bulk count string");
addReplyErrorFormat(c, setProtocolError(c, p - c->querybuf);
"Protocol error: expected '$', got '%c'", return REDIS_ERR;
c->querybuf[pos]); }
setProtocolError(c,pos); break;
return REDIS_ERR; } else {
addReplyError(c,"Protocol error: invalid bulk length");
setProtocolError(c, p - c->querybuf);
return REDIS_ERR;
}
} }
ok = string2ll(c->querybuf+pos+1,newline-(c->querybuf+pos+1),&ll); if (*(p+1) == '\0') break; /* We need a "\n" as well. */
if (!ok || ll < 0 || ll > 512*1024*1024) { p += 2; /* Skip \r\n. */
if (ll < 0 || ll > 512*1024*1024) {
addReplyError(c,"Protocol error: invalid bulk length"); addReplyError(c,"Protocol error: invalid bulk length");
setProtocolError(c,pos); setProtocolError(c, p - c->querybuf);
return REDIS_ERR; return REDIS_ERR;
} }
pos += newline-(c->querybuf+pos)+2; pos = p - c->querybuf;
if (ll >= REDIS_MBULK_BIG_ARG) { if (ll >= REDIS_MBULK_BIG_ARG) {
size_t qblen; size_t qblen;