diff --git a/src/client/sock.c b/src/client/sock.c
index a99abf10be889510541d57c25c74743842d0cfc7..6f231bd96a3e6823a405a7468a3cce6901465af4 100644 (file)
--- a/src/client/sock.c
+++ b/src/client/sock.c
#include <arpa/inet.h>
+#include <assert.h>
#include <errno.h>
#include <limits.h>
continue;
if (rstatus == UINT32_MAX) {
+ const char *str = sdb_strbuf_string(buf) + data_offset;
+ size_t len = sdb_strbuf_len(buf) - data_offset;
+
/* retrieve status and data len */
- rstatus = sdb_proto_unmarshal_int(buf, data_offset);
- rlen = sdb_proto_unmarshal_int(buf, data_offset + sizeof(rstatus));
+ assert(len >= 2 * sizeof(uint32_t));
+ rstatus = sdb_proto_unmarshal_int(str, len);
+ rlen = sdb_proto_unmarshal_int(str + sizeof(rstatus),
+ len - sizeof(rstatus));
if (! rlen)
break;