From: Jason A. Donenfeld <Jason@zx2c4.com>
Date: Mon, 12 Nov 2018 03:11:56 +0000 (-0500)
Subject: wg-quick: android: do not choke on empty allowed-ips
X-Git-Tag: v1.0.20191226~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e106d3a4c645064fc2ed6d5ff2b004391fd5ec2;p=thirdparty%2Fwireguard-tools.git

wg-quick: android: do not choke on empty allowed-ips

Reported-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---

diff --git a/src/wg-quick/android.c b/src/wg-quick/android.c
index e397664..e2b6abe 100644
--- a/src/wg-quick/android.c
+++ b/src/wg-quick/android.c
@@ -512,8 +512,11 @@ static void set_routes(const char *iface, unsigned int netid)
 		if (!start)
 			continue;
 		++start;
-		for (char *allowedip = strtok(start, " \n"); allowedip; allowedip = strtok(NULL, " \n"))
+		for (char *allowedip = strtok(start, " \n"); allowedip; allowedip = strtok(NULL, " \n")) {
+			if (!strcmp(allowedip, "(none)"))
+				continue;
 			add_route(iface, netid, allowedip);
+		}
 	}
 }