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

Use custom string2ll and strchr

Browse Source
This commit is contained in:
Pieter Noordhuis 2011-04-18 21:09:12 +02:00
parent b7d3bf5157
commit 5af302011c
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/networking.c
View File

@ -700,46 +700,48 @@ static void setProtocolError(redisClient *c, int pos) {
int processMultibulkBuffer(redisClient *c) { int processMultibulkBuffer(redisClient *c) {
char *newline = NULL; char *newline = NULL;
char *eptr; int pos = 0, ok;
int pos = 0, tolerr; long long ll;
long bulklen;
if (c->multibulklen == 0) { if (c->multibulklen == 0) {
/* The client should have been reset */ /* The client should have been reset */
redisAssert(c->argc == 0); redisAssert(c->argc == 0);
/* Multi bulk length cannot be read without a \r\n */ /* Multi bulk length cannot be read without a \r\n */
newline = strstr(c->querybuf,"\r\n"); newline = strchr(c->querybuf,'\r');
if (newline == NULL) if (newline == NULL)
return REDIS_ERR; return REDIS_ERR;
/* We know for sure there is a whole line since newline != NULL, /* We know for sure there is a whole line since newline != NULL,
* so go ahead and find out the multi bulk length. */ * so go ahead and find out the multi bulk length. */
redisAssert(c->querybuf[0] == '*'); redisAssert(c->querybuf[0] == '*');
c->multibulklen = strtol(c->querybuf+1,&eptr,10); ok = string2ll(c->querybuf+1,newline-(c->querybuf+1),&ll);
pos = (newline-c->querybuf)+2; if (!ok || ll > 1024*1024) {
if (c->multibulklen <= 0) {
c->querybuf = sdsrange(c->querybuf,pos,-1);
return REDIS_OK;
} else if (c->multibulklen > 1024*1024) {
addReplyError(c,"Protocol error: invalid multibulk length"); addReplyError(c,"Protocol error: invalid multibulk length");
setProtocolError(c,pos); setProtocolError(c,pos);
return REDIS_ERR; return REDIS_ERR;
} else {
pos = (newline-c->querybuf)+2;
if (ll <= 0) {
c->querybuf = sdsrange(c->querybuf,pos,-1);
return REDIS_OK;
} }
}
c->multibulklen = ll;
/* Setup argv array on client structure */ /* Setup argv array on client structure */
if (c->argv) zfree(c->argv); if (c->argv) zfree(c->argv);
c->argv = zmalloc(sizeof(robj*)*c->multibulklen); c->argv = zmalloc(sizeof(robj*)*c->multibulklen);
/* Search new newline */ /* Search new newline */
newline = strstr(c->querybuf+pos,"\r\n"); newline = strchr(c->querybuf+pos,'\r');
} }
redisAssert(c->multibulklen > 0); redisAssert(c->multibulklen > 0);
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 = strstr(c->querybuf+pos,"\r\n"); newline = strchr(c->querybuf+pos,'\r');
if (newline != NULL) { if (newline != NULL) {
if (c->querybuf[pos] != '$') { if (c->querybuf[pos] != '$') {
addReplyErrorFormat(c, addReplyErrorFormat(c,
@ -749,17 +751,14 @@ int processMultibulkBuffer(redisClient *c) {
return REDIS_ERR; return REDIS_ERR;
} }
bulklen = strtol(c->querybuf+pos+1,&eptr,10); ok = string2ll(c->querybuf+pos+1,newline-(c->querybuf+pos+1),&ll);
tolerr = (eptr[0] != '\r'); if (!ok || ll < 0 || ll > 512*1024*1024) {
if (tolerr || bulklen == LONG_MIN || bulklen == LONG_MAX ||
bulklen < 0 || bulklen > 512*1024*1024)
{
addReplyError(c,"Protocol error: invalid bulk length"); addReplyError(c,"Protocol error: invalid bulk length");
setProtocolError(c,pos); setProtocolError(c,pos);
return REDIS_ERR; return REDIS_ERR;
} }
pos += eptr-(c->querybuf+pos)+2; pos += newline-(c->querybuf+pos)+2;
c->bulklen = bulklen; c->bulklen = ll;
} else { } else {
/* No newline in current buffer, so wait for more data */ /* No newline in current buffer, so wait for more data */
break; break;