diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-26 20:34:49 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-27 15:35:52 +1000 |
commit | 813f55336a24fdfc45e7ed655fccc7d792e8f859 (patch) | |
tree | be0d6bd1be9409353a43b2b6464e5b4d98d3d4f6 /sshbuf.c | |
parent | 6cf711752cc2a7ffaad1fb4de18cae65715ed8bb (diff) |
upstream commit
sshbuf_consume: reset empty buffer; ok djm@
Upstream-ID: 0d4583ba57f69e369d38bbd7843d85cac37fa821
Diffstat (limited to 'sshbuf.c')
-rw-r--r-- | sshbuf.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshbuf.c,v 1.8 2016/11/25 23:22:04 djm Exp $ */ | 1 | /* $OpenBSD: sshbuf.c,v 1.9 2017/05/26 20:34:49 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2011 Damien Miller | 3 | * Copyright (c) 2011 Damien Miller |
4 | * | 4 | * |
@@ -391,6 +391,9 @@ sshbuf_consume(struct sshbuf *buf, size_t len) | |||
391 | if (len > sshbuf_len(buf)) | 391 | if (len > sshbuf_len(buf)) |
392 | return SSH_ERR_MESSAGE_INCOMPLETE; | 392 | return SSH_ERR_MESSAGE_INCOMPLETE; |
393 | buf->off += len; | 393 | buf->off += len; |
394 | /* deal with empty buffer */ | ||
395 | if (buf->off == buf->size) | ||
396 | buf->off = buf->size = 0; | ||
394 | SSHBUF_TELL("done"); | 397 | SSHBUF_TELL("done"); |
395 | return 0; | 398 | return 0; |
396 | } | 399 | } |