Changeset 2340 for zzuf/trunk/srcTweet

Timestamp:

May 19, 2008, 1:24:41 PM (12 years ago)

Author:

Sam Hocevar

Message:

• Fix an invalid cast on the Alpha architecture caused by sockaddr_in* having larger alignment requirements than sockaddr*.

File:

• zzuf/trunk/src/lib-fd.c (modified) (2 diffs)

zzuf/trunk/src/lib-fd.c

@@ -262 +262 @@
         if(ret >= 0) \
         { \
-            const struct sockaddr_in* in = (const struct sockaddr_in *)addr; \
+            struct sockaddr_in in; \
             long int port; \
             switch(addr->sa_family) \
@@ -268 +268 @@
             case AF_INET: \
             case_AF_INET6 \
-                port = ntohs(in->sin_port); \
+                /* We need to copy rather than cast sockaddr* to sockaddr_in* \
+                 * because sockaddr_in* has actually _larger_ alignment on \
+                 * eg. Linux alpha. And we only need sin_port so we only copy \
+                 * this member. */ \
+                memcpy(&in.sin_port, \
+                   (char const *)addr + ((char *)&in.sin_port - (char *)&in), \
+                   sizeof(in.sin_port)); \
+                port = ntohs(in.sin_port); \
                 if(_zz_portwatched(port)) \
                     break; \