From: tobias@openbsd.org <tobias@openbsd.org>
Date: Wed, 14 Aug 2024 15:37:11 +0000 (+0000)
Subject: upstream: Use freezero for better readability
X-Git-Tag: V_9_9_P1~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc48ddf6998188517af42dce807e2088b6a0c0be;p=thirdparty%2Fopenssh-portable.git

upstream: Use freezero for better readability

It has the same meaning as the current pair of calling explicit_bzero
and free. Spotted with Benny Baumann (BenBE at geshi dot org).

ok djm@

OpenBSD-Commit-ID: 939fbe9ccf52d0d48c5fa53694d6f3bb9927970c
---

diff --git a/sshbuf.c b/sshbuf.c
index 8e97355fa..690dce6fa 100644
--- a/sshbuf.c
+++ b/sshbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshbuf.c,v 1.20 2024/08/14 15:35:23 tobias Exp $	*/
+/*	$OpenBSD: sshbuf.c,v 1.21 2024/08/14 15:37:11 tobias Exp $	*/
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -185,10 +185,8 @@ sshbuf_free(struct sshbuf *buf)
 	sshbuf_free(buf->parent);
 	buf->parent = NULL;
 
-	if (!buf->readonly) {
-		explicit_bzero(buf->d, buf->alloc);
-		free(buf->d);
-	}
+	if (!buf->readonly)
+		freezero(buf->d, buf->alloc);
 	freezero(buf, sizeof(*buf));
 }