diff options
author | Colin Watson <cjwatson@debian.org> | 2020-10-20 14:12:31 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-10-20 14:12:31 +0100 |
commit | e371906fbbbbc11b0dced8fd4e0d258eb489d7c1 (patch) | |
tree | 4d0d8d2afd52572deb7910e29ff5a334b2bcf702 /sshbuf-getput-basic.c | |
parent | e429009cde648a41479cd1b60ce972760a2bdabc (diff) | |
parent | 3728919292c05983372954d27426f7d966813139 (diff) |
New upstream release (8.4p1)
Diffstat (limited to 'sshbuf-getput-basic.c')
-rw-r--r-- | sshbuf-getput-basic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sshbuf-getput-basic.c b/sshbuf-getput-basic.c index da834d008..9803fb5ed 100644 --- a/sshbuf-getput-basic.c +++ b/sshbuf-getput-basic.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshbuf-getput-basic.c,v 1.10 2019/12/13 19:09:37 djm Exp $ */ | 1 | /* $OpenBSD: sshbuf-getput-basic.c,v 1.11 2020/06/05 03:25:35 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2011 Damien Miller | 3 | * Copyright (c) 2011 Damien Miller |
4 | * | 4 | * |
@@ -338,6 +338,8 @@ sshbuf_put(struct sshbuf *buf, const void *v, size_t len) | |||
338 | int | 338 | int |
339 | sshbuf_putb(struct sshbuf *buf, const struct sshbuf *v) | 339 | sshbuf_putb(struct sshbuf *buf, const struct sshbuf *v) |
340 | { | 340 | { |
341 | if (v == NULL) | ||
342 | return 0; | ||
341 | return sshbuf_put(buf, sshbuf_ptr(v), sshbuf_len(v)); | 343 | return sshbuf_put(buf, sshbuf_ptr(v), sshbuf_len(v)); |
342 | } | 344 | } |
343 | 345 | ||