]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Remove null check after checking for checking for did_open_tun
authorArne Schwabe <arne@rfc2549.org>
Wed, 25 Sep 2024 15:11:04 +0000 (17:11 +0200)
committerGert Doering <gert@greenie.muc.de>
Wed, 25 Sep 2024 16:49:15 +0000 (18:49 +0200)
If we indicate that the tun device has been opened the c1.tuntap struct
is guaranteed to be defined. This extra null check is something that
Coverity flags as we access a do a null check after already accessing fields
of tuntap

Change-Id: I9966636163c7dfa208d26f1cadbf5b81937f3a34
Signed-off-by: Arne Schwabe <arne-openvpn@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20240925151104.13036-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29447.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
src/openvpn/init.c

index 876edad736f131087e0760160f0e925a6d3c4a0a..ae911a9fcdaaaa0bdd3a2efc5592ddc8fe4f1eb3 100644 (file)
@@ -2546,10 +2546,7 @@ do_up(struct context *c, bool pulled_options, unsigned int option_types_found)
             {
                 event_timeout_init(&c->c2.route_wakeup, c->options.route_delay, now);
                 event_timeout_init(&c->c2.route_wakeup_expire, c->options.route_delay + c->options.route_delay_window, now);
-                if (c->c1.tuntap)
-                {
-                    tun_standby_init(c->c1.tuntap);
-                }
+                tun_standby_init(c->c1.tuntap);
             }
             else
             {