From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 1 Dec 2021 23:31:55 +0000 (+0900)
Subject: parse-util: refuse leading white space in port number
X-Git-Tag: v250-rc1~93^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c9bb70854745b34a3d63ce3c27afd769b1350c1;p=thirdparty%2Fsystemd.git

parse-util: refuse leading white space in port number

When parse_ip_port() is directly used in a conf parser, then that's
fine, as the rvalue is already truncated.

When parse_ip_port() is used when e.g. parsing IP address with port,
then we should really refuse white space after colon.
---

diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index d03a6eeb05e..2888ab6523f 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -644,7 +644,7 @@ int parse_ip_port(const char *s, uint16_t *ret) {
         uint16_t l;
         int r;
 
-        r = safe_atou16(s, &l);
+        r = safe_atou16_full(s, SAFE_ATO_REFUSE_LEADING_WHITESPACE, &l);
         if (r < 0)
                 return r;