net: add IP regex check for net_resolve_address()

baresip · Jun 22, 2021 · f11b995 · f11b995
1 parent c3a585f
commit f11b995
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/src/net/net.c b/src/net/net.c
@@ -235,8 +235,28 @@ int net_resolve_address(const char *addr, struct sa *sa)
 {
 	struct addrinfo *res, *res0 = NULL;
 	struct addrinfo hints;
+	struct pl pl;
 	int err;
 
+	if (!str_isset(addr) || !sa)
+		return EINVAL;
+
+	/* Try IPv6 first */
+	err = re_regex(addr, strlen(addr), "[0-9a-f]+:[0-9a-f]*:[0-9a-f:]+",
+			&pl, NULL, NULL);
+
+	if (!err && pl.p>addr)
+		return EINVAL;
+
+	/* Then non-IPv6 host */
+	if (err)
+		err = re_regex(addr, strlen(addr),
+			       "[0-9]+.[0-9]+.[0-9]+.[0-9]+",
+			       NULL, NULL, NULL, NULL);
+
+	if (err)
+		return EINVAL;
+
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_flags  = AI_V4MAPPED | AI_ADDRCONFIG | AI_NUMERICHOST;