Changeset 3fbce97 for ipc.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• ipc.c (modified) (2 diffs)

ipc.c

@@ -590 +590 @@
                                 }
 
-                                *recv_fd = *(int *) CMSG_DATA(cmsg);
+                                memcpy(recv_fd, CMSG_DATA(cmsg), sizeof(int));
                                 /*
                                 fprintf( stderr, "pid %d received fd %d\n", (int) getpid(), *recv_fd );
@@ -758 +758 @@
         cmsg->cmsg_type = SCM_RIGHTS;
         cmsg->cmsg_len = CMSG_LEN(sizeof(send_fd));
-        *(int *) CMSG_DATA(cmsg) = send_fd;
+        memcpy(CMSG_DATA(cmsg), &send_fd, sizeof(int));
         msg.msg_controllen = cmsg->cmsg_len;
 #endif