diff options
author | taiyu <taiyu.len@gmail.com> | 2018-09-02 17:07:12 -0700 |
---|---|---|
committer | taiyu <taiyu.len@gmail.com> | 2018-09-02 17:07:12 -0700 |
commit | d625d68d4a64ccf277663b26c52f4ca51d494e6a (patch) | |
tree | c7ede86177a4ccdaffc9e8cc52b8d0827674b9fb /sway/ipc-server.c | |
parent | Merge pull request #2544 from RyanDwyer/fix-deferred-cmd-crash (diff) | |
download | sway-d625d68d4a64ccf277663b26c52f4ca51d494e6a.tar.gz sway-d625d68d4a64ccf277663b26c52f4ca51d494e6a.tar.zst sway-d625d68d4a64ccf277663b26c52f4ca51d494e6a.zip |
prevent ub caused by misaligned stores/loads
Diffstat (limited to 'sway/ipc-server.c')
-rw-r--r-- | sway/ipc-server.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index ed710be5..fb5be27b 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
@@ -253,8 +253,8 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) { | |||
253 | return 0; | 253 | return 0; |
254 | } | 254 | } |
255 | 255 | ||
256 | client->payload_length = buf32[0]; | 256 | memcpy(&client->payload_length, &buf32[0], sizeof(buf32[0])); |
257 | client->current_command = (enum ipc_command_type)buf32[1]; | 257 | memcpy(&client->current_command, &buf32[1], sizeof(buf32[1])); |
258 | 258 | ||
259 | if (read_available - received >= (long)client->payload_length) { | 259 | if (read_available - received >= (long)client->payload_length) { |
260 | ipc_client_handle_command(client); | 260 | ipc_client_handle_command(client); |
@@ -832,8 +832,8 @@ bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t pay | |||
832 | uint32_t *data32 = (uint32_t*)(data + sizeof(ipc_magic)); | 832 | uint32_t *data32 = (uint32_t*)(data + sizeof(ipc_magic)); |
833 | 833 | ||
834 | memcpy(data, ipc_magic, sizeof(ipc_magic)); | 834 | memcpy(data, ipc_magic, sizeof(ipc_magic)); |
835 | data32[0] = payload_length; | 835 | memcpy(&data32[0], &payload_length, sizeof(payload_length)); |
836 | data32[1] = client->current_command; | 836 | memcpy(&data32[1], &client->current_command, sizeof(client->current_command)); |
837 | 837 | ||
838 | while (client->write_buffer_len + ipc_header_size + payload_length >= | 838 | while (client->write_buffer_len + ipc_header_size + payload_length >= |
839 | client->write_buffer_size) { | 839 | client->write_buffer_size) { |