]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Properly free tuntap struct on android when emulating persist-tun
authorArne Schwabe <arne@rfc2549.org>
Wed, 12 Sep 2018 11:07:01 +0000 (13:07 +0200)
committerGert Doering <gert@greenie.muc.de>
Tue, 25 Sep 2018 14:28:15 +0000 (16:28 +0200)
Trac-Ticket: #851
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20180912110701.31609-1-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg17460.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit da3f583f30a4b2be9cc5501874373fc4f627158d)

src/openvpn/init.c

index 6968c7710ea0e5c5be5a3b56831196063d05f946..87d42874a7aabf9184bbd6d569bdb7d6a8ecc0b5 100644 (file)
@@ -1693,6 +1693,9 @@ do_open_tun(struct context *c)
     if (c->c1.tuntap)
     {
         oldtunfd = c->c1.tuntap->fd;
+        free(c->c1.tuntap);
+        c->c1.tuntap = NULL;
+        c->c1.tuntap_owned = false;
     }
 #endif