* [PATCH iproute2] utils: relax strtoX checking in get_time_rtt
@ 2014-11-11 0:38 Florian Westphal
0 siblings, 0 replies; only message in thread
From: Florian Westphal @ 2014-11-11 0:38 UTC (permalink / raw)
To: netdev; +Cc: Florian Westphal
ip route change dev tap0 192.168.7.0/24 rto_min 1ms
Error: argument "1ms" is wrong: "rto_min" value is invalid
get_time_rtt() checks for 's' or 'msec' and converts to milliseconds
if needed.
Fixes: 697ac63905 (utils: fix range checking for get_u32/get_u64 et all)
Signed-off-by: Florian Westphal <fw@strlen.de>
---
lib/utils.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/utils.c b/lib/utils.c
index dc21567..987377b 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -144,8 +144,8 @@ int get_time_rtt(unsigned *val, const char *arg, int *raw)
if (t < 0.0)
return -1;
- /* extra non-digits */
- if (!p || p == arg || *p)
+ /* no digits? */
+ if (!p || p == arg)
return -1;
/* over/underflow */
@@ -154,8 +154,8 @@ int get_time_rtt(unsigned *val, const char *arg, int *raw)
} else {
res = strtoul(arg, &p, 0);
- /* empty string or trailing non-digits */
- if (!p || p == arg || *p)
+ /* empty string? */
+ if (!p || p == arg)
return -1;
/* overflow */
--
2.0.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-11-11 0:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-11 0:38 [PATCH iproute2] utils: relax strtoX checking in get_time_rtt Florian Westphal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox