memcached
diff --git a/‎proto_proxy.c
Lines changed: 8 additions & 1 deletion b/‎proto_proxy.c
Lines changed: 8 additions & 1 deletion
diff --git a/‎proxy.h
Lines changed: 0 additions & 1 deletion b/‎proxy.h
Lines changed: 0 additions & 1 deletion
diff --git a/‎proxy_request.c
Lines changed: 5 additions & 4 deletions b/‎proxy_request.c
Lines changed: 5 additions & 4 deletions
@@ -1047,6 +1047,7 @@ static void proxy_process_command(conn *c, char *command, size_t cmdlen, bool mu
         const char *curkey = pr.request + keyoff;
         int klen = pr.klen;
         int cmd_prefix_len = pr.tok.tokens[pr.keytoken];
+        size_t endlen = 0;
 
         // TODO: TEST THIS CASE
         // check once if our prefix is too long.
@@ -1059,6 +1060,12 @@ static void proxy_process_command(conn *c, char *command, size_t cmdlen, bool mu
             return;
         }
 
+        if (pr.request[pr.reqlen-2] == '\r') {
+            endlen = pr.reqlen - 2;
+        } else {
+            endlen = pr.reqlen - 1;
+        }
+
         while (klen != 0) {
             char temp[KEY_MAX_LENGTH + MAX_CMD_PREFIX + 30];
             char *cur = temp;
@@ -1092,7 +1099,7 @@ static void proxy_process_command(conn *c, char *command, size_t cmdlen, bool mu
             // Find the next key manually. This keeps the special cased code
             // here instead of adding extra junk to the parser structure.
             curkey += klen;
-            int remain = pr.endlen - (curkey - pr.request);
+            int remain = endlen - (curkey - pr.request);
             while (remain) {
                 if (*curkey == ' ') {
                     remain--;
 
@@ -341,7 +341,6 @@ struct mcp_parser_s {
     uint8_t cmd_type; // command class.
     uint8_t keytoken; // because GAT. sigh. also cmds without a key.
     uint32_t reqlen; // full length of request buffer.
-    uint32_t endlen; // index to the start of \r\n or \n
     int vlen;
     uint32_t klen; // length of key.
     bool noreply; // if quiet/noreply mode is set.
 
@@ -135,17 +135,18 @@ int process_request(mcp_parser_t *pr, const char *command, size_t cmdlen) {
     // with a \r\n requirement but never did this and need backcompat.
     // In this case we _know_ \n is at cmdlen because we can't enter this
     // function otherwise.
+    size_t endlen = 0;
     if (cm[cmdlen-2] == '\r') {
-        pr->endlen = cmdlen - 2;
+        endlen = cmdlen - 2;
     } else {
-        pr->endlen = cmdlen - 1;
+        endlen = cmdlen - 1;
     }
 
-    const char *s = memchr(command, ' ', pr->endlen);
+    const char *s = memchr(command, ' ', endlen);
     if (s != NULL) {
         cl = s - command;
     } else {
-        cl = pr->endlen;
+        cl = endlen;
     }
     pr->keytoken = 0;
     pr->request = command;