From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 27 Nov 2015 16:48:54 +0000 (-0500)
Subject: Make SIZEOF_SOCKADDR return socklen_t to avoid bad compares.
X-Git-Tag: tor-0.2.8.1-alpha~199
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f108be7c2556de20dc34c0a8ad52b19c363febbd;p=thirdparty%2Ftor.git

Make SIZEOF_SOCKADDR return socklen_t to avoid bad compares.
---

diff --git a/src/common/compat.c b/src/common/compat.c
index 9e76592615..0b4e4a428d 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -1487,10 +1487,18 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2])
 
 #ifdef NEED_ERSATZ_SOCKETPAIR
 
-#define SIZEOF_SOCKADDR(domain) \
-  (domain == AF_INET ? sizeof(struct sockaddr_in) : \
-   (domain == AF_INET6 ? sizeof(struct sockaddr_in6) : \
-    ((size_t)0) /* unsupported, don't match any valid size */))
+static INLINE socklen_t
+SIZEOF_SOCKADDR(int domain)
+{
+  switch (domain) {
+    case AF_INET:
+      return sizeof(struct sockaddr_in);
+    case AF_INET6:
+      return sizeof(struct sockaddr_in6);
+    default:
+      return 0;
+  }
+}
 
 /**
  * Helper used to implement socketpair on systems that lack it, by