From: Arne Schwabe Date: Thu, 15 Aug 2019 12:10:52 +0000 (+0200) Subject: Fix check if iface name is set X-Git-Tag: v2.5_beta1~292 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac4ceada14b9cb8d1a6180a2e1e07d81af8e34f6;p=thirdparty%2Fopenvpn.git Fix check if iface name is set Clang/Android complained warning: address of array 'rgi6->iface' will always evaluate to 'true' [-Wpointer-bool-conversion] if (rgi6->iface) iface is a char[16]; So its pointer is always true. we do a CLEAR(rgi6) always before setting this struct and strcpy the name into iface. So using strlen instead of checking for the pointer should be the right fix. Patch V2: use if(strlen > 0) instead of if(strlen) Signed-off-by: Arne Schwabe Acked-by: Antonio Quartulli Message-Id: <20190815121053.18433-1-arne@rfc2549.org> URL: https://www.mail-archive.com/search?l=mid&q=20190815121053.18433-1-arne@rfc2549.org Signed-off-by: Gert Doering --- diff --git a/src/openvpn/route.c b/src/openvpn/route.c index bf0366894..dac472151 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -3338,7 +3338,7 @@ get_default_gateway_ipv6(struct route_ipv6_gateway_info *rgi6, rgi6->flags |= RGI_ADDR_DEFINED; } - if (rgi6->iface) + if (strlen(rgi6->iface) > 0) { rgi6->flags |= RGI_IFACE_DEFINED; }