From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 13 Dec 2019 19:09:37 +0000 (+0000)
Subject: upstream: allow sshbuf_put_stringb(buf, NULL); ok markus@
X-Git-Tag: V_8_2_P1~204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=612b1dd1ec91ffb1e01f58cca0c6eb1d47bf4423;p=thirdparty%2Fopenssh-portable.git

upstream: allow sshbuf_put_stringb(buf, NULL); ok markus@

OpenBSD-Commit-ID: 91482c1ada9adb283165d48dafbb88ae91c657bd
---

diff --git a/sshbuf-getput-basic.c b/sshbuf-getput-basic.c
index d401a7265..da834d008 100644
--- a/sshbuf-getput-basic.c
+++ b/sshbuf-getput-basic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshbuf-getput-basic.c,v 1.9 2019/09/06 04:53:27 djm Exp $	*/
+/*	$OpenBSD: sshbuf-getput-basic.c,v 1.10 2019/12/13 19:09:37 djm Exp $	*/
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -535,6 +535,9 @@ sshbuf_put_cstring(struct sshbuf *buf, const char *v)
 int
 sshbuf_put_stringb(struct sshbuf *buf, const struct sshbuf *v)
 {
+	if (v == NULL)
+		return sshbuf_put_string(buf, NULL, 0);
+
 	return sshbuf_put_string(buf, sshbuf_ptr(v), sshbuf_len(v));
 }