[openssh-commits] [openssh] 04/06: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 0097565f849851812df610b7b6b3c4bd414f6c62
Author: markus at openbsd.org <markus at openbsd.org>
Date:   Mon Jan 12 19:22:46 2015 +0000

    upstream commit
    
    missing error assigment on sshbuf_put_string()
---
 krl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/krl.c b/krl.c
index 5fa7463..47d6d2c 100644
--- a/krl.c
+++ b/krl.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $OpenBSD: krl.c,v 1.23 2015/01/12 14:05:19 markus Exp $ */
+/* $OpenBSD: krl.c,v 1.24 2015/01/12 19:22:46 markus Exp $ */
 
 #include "includes.h"
 
@@ -716,7 +716,7 @@ ssh_krl_to_blob(struct ssh_krl *krl, struct sshbuf *buf,
 	sshbuf_reset(sect);
 	RB_FOREACH(rb, revoked_blob_tree, &krl->revoked_keys) {
 		debug3("%s: key len %zu ", __func__, rb->len);
-		if ((sshbuf_put_string(sect, rb->blob, rb->len)) != 0)
+		if ((r = sshbuf_put_string(sect, rb->blob, rb->len)) != 0)
 			goto out;
 	}
 	if (sshbuf_len(sect) != 0) {
@@ -727,7 +727,7 @@ ssh_krl_to_blob(struct ssh_krl *krl, struct sshbuf *buf,
 	sshbuf_reset(sect);
 	RB_FOREACH(rb, revoked_blob_tree, &krl->revoked_sha1s) {
 		debug3("%s: hash len %zu ", __func__, rb->len);
-		if ((sshbuf_put_string(sect, rb->blob, rb->len)) != 0)
+		if ((r = sshbuf_put_string(sect, rb->blob, rb->len)) != 0)
 			goto out;
 	}
 	if (sshbuf_len(sect) != 0) {

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.