From 813f55336a24fdfc45e7ed655fccc7d792e8f859 Mon Sep 17 00:00:00 2001 From: "markus@openbsd.org" Date: Fri, 26 May 2017 20:34:49 +0000 Subject: upstream commit sshbuf_consume: reset empty buffer; ok djm@ Upstream-ID: 0d4583ba57f69e369d38bbd7843d85cac37fa821 --- sshbuf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sshbuf.c b/sshbuf.c index cbf7ed4a4..652c99a21 100644 --- a/sshbuf.c +++ b/sshbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshbuf.c,v 1.8 2016/11/25 23:22:04 djm Exp $ */ +/* $OpenBSD: sshbuf.c,v 1.9 2017/05/26 20:34:49 markus Exp $ */ /* * Copyright (c) 2011 Damien Miller * @@ -391,6 +391,9 @@ sshbuf_consume(struct sshbuf *buf, size_t len) if (len > sshbuf_len(buf)) return SSH_ERR_MESSAGE_INCOMPLETE; buf->off += len; + /* deal with empty buffer */ + if (buf->off == buf->size) + buf->off = buf->size = 0; SSHBUF_TELL("done"); return 0; } -- cgit v1.2.3