projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Committing work for next release (got to do something over lunch aye?)
[awesomized/libmemcached]
/
lib
/
memcached_response.c
diff --git
a/lib/memcached_response.c
b/lib/memcached_response.c
index 0755ae0c191cdeb61f217f330433c3ac2c8728ab..7402975f895761ade88c41864174b074e630c433 100644
(file)
--- a/
lib/memcached_response.c
+++ b/
lib/memcached_response.c
@@
-42,8
+42,13
@@
memcached_return memcached_response(memcached_st *ptr,
buffer_ptr++;
total_length++;
buffer_ptr++;
total_length++;
- WATCHPOINT_ASSERT(total_length < buffer_length);
+ WATCHPOINT_ASSERT(total_length <= buffer_length);
+
+ if (total_length >= buffer_length)
+ return MEMCACHED_PROTOCOL_ERROR;
}
}
+ buffer_ptr++;
+ *buffer_ptr= 0;
if (memcached_server_response_count(ptr, server_key))
memcached_server_response_decrement(ptr, server_key);
if (memcached_server_response_count(ptr, server_key))
memcached_server_response_decrement(ptr, server_key);