commit 9ff90b67c74ab4e787f9ee313e057cf4251a8167
author Maciej Żenczykowski <maze@google.com> Mon Dec 02 07:31:28 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 02 07:31:28 2019 +0000
tree f3ecf259b8450d936396fab47e02f49fcd37960a
parent c8574ef0d72941816630a6e27188628f3694ab15
parent d7ed9ef9a005643dc04dc4ba8896e487ead9615d

Merge "Return a valid error code when adding an invalid IP address."

libnetutils/ifc_utils.c

diff --git a/libnetutils/ifc_utils.c b/libnetutils/ifc_utils.c
index 6af49bb..4e73401 100644
--- a/libnetutils/ifc_utils.c
+++ b/libnetutils/ifc_utils.c
@@ -113,6 +113,10 @@
     if (ret == 0) {
         memcpy(ss, ai->ai_addr, ai->ai_addrlen);
         freeaddrinfo(ai);
+    } else {
+        // Getaddrinfo has its own error codes. Convert to negative errno.
+        // There, the only thing that can reasonably happen is that the passed-in string is invalid.
+        ret = (ret == EAI_SYSTEM) ? -errno : -EINVAL;
     }
 
     return ret;