[openssh-commits] [openssh] 05/05: upstream: make sshbuf_putb(b, NULL) a no-op

[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 ea547eb0329c2f8da77a4ac05f6c330bd49bdaab
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Fri Jun 5 03:25:35 2020 +0000

    upstream: make sshbuf_putb(b, NULL) a no-op
    
    OpenBSD-Commit-ID: 976fdc99b500e347023d430df372f31c1dd128f7
---
 sshbuf-getput-basic.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sshbuf-getput-basic.c b/sshbuf-getput-basic.c
index da834d00..9803fb5e 100644
--- a/sshbuf-getput-basic.c
+++ b/sshbuf-getput-basic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshbuf-getput-basic.c,v 1.10 2019/12/13 19:09:37 djm Exp $	*/
+/*	$OpenBSD: sshbuf-getput-basic.c,v 1.11 2020/06/05 03:25:35 djm Exp $	*/
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -338,6 +338,8 @@ sshbuf_put(struct sshbuf *buf, const void *v, size_t len)
 int
 sshbuf_putb(struct sshbuf *buf, const struct sshbuf *v)
 {
+	if (v == NULL)
+		return 0;
 	return sshbuf_put(buf, sshbuf_ptr(v), sshbuf_len(v));
 }
 

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