util: improve overflow checks

[elogind.git] / src / shared / socket-util.c

diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
index 471b6dc2842719ac525bc6bcdd019909d70af1e4..4908403d9fe4a447b12142a5db2823e70de33422 100644 (file)
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -35,6 +35,7 @@
 #include "macro.h"
 #include "util.h"
 #include "mkdir.h"
+#include "path-util.h"
 #include "socket-util.h"
 #include "missing.h"
 
@@ -166,7 +167,8 @@ int socket_address_parse(SocketAddress *a, const char *s) {
                 } else {
 
                         /* Just a port */
-                        if ((r = safe_atou(s, &u)) < 0)
+                        r = safe_atou(s, &u);
+                        if (r < 0)
                                 return r;
 
                         if (u <= 0 || u > 0xFFFF)