Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix delete parsing for memcache #283

Closed
wants to merge 1 commit into from
Closed

fix delete parsing for memcache #283

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 43 additions & 1 deletion src/proto/nc_memcache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ memcache_parse_req(struct msg *r)
struct mbuf *b;
uint8_t *p, *m;
uint8_t ch;
uint8_t *last_num;
int last_num_size;
enum {
SW_START,
SW_REQ_TYPE,
Expand All @@ -147,12 +149,16 @@ memcache_parse_req(struct msg *r)
SW_NUM,
SW_RUNTO_CRLF,
SW_CRLF,
SW_RUNTO_DELETE_CRLF,
SW_NOREPLY,
SW_AFTER_NOREPLY,
SW_ALMOST_DONE,
SW_SENTINEL
} state;

last_num = NULL;
last_num_size = 0;

state = r->state;
b = STAILQ_LAST(&r->mhdr, mbuf, next);

Expand Down Expand Up @@ -345,7 +351,7 @@ memcache_parse_req(struct msg *r)
} else if (memcache_arithmetic(r)) {
state = SW_SPACES_BEFORE_NUM;
} else if (memcache_delete(r)) {
state = SW_RUNTO_CRLF;
state = SW_RUNTO_DELETE_CRLF;
} else if (memcache_retrieval(r)) {
state = SW_SPACES_BEFORE_KEYS;
} else {
Expand Down Expand Up @@ -536,6 +542,7 @@ memcache_parse_req(struct msg *r)
}
/* num_start <- p; num <- ch - '0' */
r->token = p;
last_num = p;
state = SW_NUM;
}

Expand All @@ -546,6 +553,7 @@ memcache_parse_req(struct msg *r)
/* num <- num * 10 + (ch - '0') */
;
} else if (ch == ' ' || ch == CR) {
last_num_size = (int)(p - r->token);
r->token = NULL;
/* num_end <- p - 1 */
p = p - 1; /* go back by 1 byte */
Expand All @@ -556,6 +564,32 @@ memcache_parse_req(struct msg *r)

break;

case SW_RUNTO_DELETE_CRLF:
if (isdigit(ch)) {
state = SW_SPACES_BEFORE_NUM;
p = p - 1;
break;
}

switch (ch) {
case ' ':
break;

case CR:
state = SW_ALMOST_DONE;
break;

case 'n':
r->token = p;
state = SW_NOREPLY;
break;

default:
goto error;
}

break;

case SW_RUNTO_CRLF:
switch (ch) {
case ' ':
Expand Down Expand Up @@ -599,6 +633,8 @@ memcache_parse_req(struct msg *r)
r->noreply = 1;
state = SW_AFTER_NOREPLY;
p = p - 1; /* go back by 1 byte */
last_num = NULL;
last_num_size = 0;
} else {
goto error;
}
Expand Down Expand Up @@ -641,6 +677,12 @@ memcache_parse_req(struct msg *r)
break;

case SW_ALMOST_DONE:
if (memcache_delete(r) && last_num != NULL) {
if (last_num_size != 1 || last_num[0] != '0') {
goto error;
}
}

switch (ch) {
case LF:
/* req_end <- p */
Expand Down