| Message ID | 20230515155407.38647-1-frank@lichtenheld.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] Fix two unused assignments | expand |
Acked-by: Gert Doering <gert@greenie.muc.de> "Quite obvious, if you look at it" :-) - since one of this is Windows, I have at least compile-tested this on MinGW. Your patch has been applied to the master and release/2.6 branch. commit b5cf76cbdc0d7ef2817b71f4611d99455e2d48ea (master) commit eb9fffe64a095a881db848839aef6960e1402ca6 (release/2.6) Author: Frank Lichtenheld Date: Mon May 15 17:54:07 2023 +0200 Fix two unused assignments Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20230515155407.38647-1-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26662.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/src/openvpn/push.c b/src/openvpn/push.c index 54e53f6a..8e962719 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -713,7 +713,6 @@ send_push_options(struct context *c, struct buffer *buf, { struct push_entry *e = push_list->head; - e = push_list->head; while (e) { if (e->enable) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 2320e8b1..df10dbd2 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -4337,7 +4337,6 @@ get_unspecified_device_guid(const int device_number, struct gc_arena *gc) { const struct tap_reg *tap_reg = tap_reg_src; - struct buffer ret = clear_buf(); struct buffer actual = clear_buf(); int i; @@ -4381,7 +4380,7 @@ get_unspecified_device_guid(const int device_number, } /* Save GUID for return value */ - ret = alloc_buf_gc(256, gc); + struct buffer ret = alloc_buf_gc(256, gc); buf_printf(&ret, "%s", tap_reg->guid); if (windows_driver != NULL) {
A fallout of my memleak investigation. These are not leaks, we just assign a value that is never read before overwritten. Not critical, but since I already stumbled over it... Change-Id: I761ea3d289f49a20e42a3d1bfccebce3c7447afe Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> --- src/openvpn/push.c | 1 - src/openvpn/tun.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)