diff options
-rw-r--r-- | marshal.c | 4 | ||||
-rw-r--r-- | unmarshal.c | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -50,8 +50,8 @@ libsha2_marshal(const struct libsha2_state *restrict state, char *restrict buf) *(size_t *)&buf[off] = state->chunk_size; off += sizeof(size_t); if (buf) - memcpy(&buf[off], state->chunk, state->chunk_size); - off += state->chunk_size; + memcpy(&buf[off], state->chunk, state->message_size % state->chunk_size); + off += state->message_size % state->chunk_size; return off; } diff --git a/unmarshal.c b/unmarshal.c index 315d556..6bbfaa0 100644 --- a/unmarshal.c +++ b/unmarshal.c @@ -74,12 +74,12 @@ libsha2_unmarshal(struct libsha2_state *restrict state, const char *restrict buf state->chunk_size = *(const size_t *)&buf[off]; off += sizeof(size_t); - if (bufsize - off < state->chunk_size) { + if (bufsize - off < state->message_size % state->chunk_size) { errno = EINVAL; return 0; } - memcpy(state->chunk, &buf[off], state->chunk_size); - off += state->chunk_size; + memcpy(state->chunk, &buf[off], state->message_size % state->chunk_size); + off += state->message_size % state->chunk_size; return off; } |