upstream: Plug a couple of minor mem leaks. From beldmit at

gmail.com via github PR#283, ok markus@

OpenBSD-Commit-ID: ec1fa7d305d46226861c3ca6fb9c9beb2ada2892

diff --git a/sftp-client.c b/sftp-client.c
index f80113ed61cd290c4045bdd4a63480c130a9da5b..6c33a836d6b902c4ff1a7870e23ce824a9750167 100644 (file)
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.156 2021/10/24 21:24:17 deraadt Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.157 2021/11/06 10:13:39 dtucker Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -2195,6 +2195,7 @@ handle_dest_replies(struct sftp_conn *to, const char *to_path, int synchronous,
                (*nreqsp)--;
        }
        debug3_f("done: %u outstanding replies", *nreqsp);
+       sshbuf_free(msg);
 }
 
 int

diff --git a/sftp-server.c b/sftp-server.c
index 18d19491125721854c34afb81465e12f2863c6bf..1b0c42d4cb467e0a8fdb1d4aff8596dd16f8a395 100644 (file)
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.129 2021/08/09 23:47:44 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.130 2021/11/06 10:13:39 dtucker Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -1553,6 +1553,7 @@ process_extended_expand(u_int32_t id)
                        npath = xstrdup(path + 2);
                        free(path);
                        xasprintf(&path, "%s/%s", cwd, npath);
+                       free(npath);
                } else {
                        /* ~user expansions */
                        if (tilde_expand(path, pw->pw_uid, &npath) != 0) {