--- a/memcache/command.c	Thu Aug 28 01:42:28 2008 +0300
+++ b/memcache/command.c	Thu Aug 28 03:12:11 2008 +0300
@@ -94,7 +94,7 @@
             assert(key->len > 0 && key->buf != NULL);
             // XXX: ensure that we have a valid buf
 
-            if (evbuffer_add_printf(buf, "%s %*s %u %lu %zu\r\n", cmd_name, (int) key->len, key->buf, obj->flags, obj->exptime, obj->bytes))
+            if (evbuffer_add_printf(buf, "%s %*s %u %lu %zu\r\n", cmd_name, (int) key->len, key->buf, obj->flags, obj->exptime, obj->bytes) == -1)
                 ERROR("evbuffer_add_printf");
 
             break;
@@ -142,7 +142,7 @@
     } while (line_length == 0);
     
     // just check to make sure that it really is null-delimited
-    assert(line[line_length - 1] == '\0');
+    assert(line[line_length] == '\0');
 
     // use strsep
     token_cursor = line;