mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 00:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2563 from taiyu-len/fix/misaligned-pointer-access

Browse source 
fix misaligned integer stores/loads
This commit is contained in:
Drew DeVault 2018-09-03 10:57:21 -04:00 committed by GitHub
parent 15c57f476f d625d68d4a
commit 7d353813d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/ipc-client.c
View file

@ -78,8 +78,8 @@ struct ipc_response *ipc_recv_response(int socketfd) {
} }
total = 0; total = 0;
response->size = data32[0]; memcpy(&response->size, &data32[0], sizeof(data32[0]));
response->type = data32[1]; memcpy(&response->type, &data32[1], sizeof(data32[1]));
char *payload = malloc(response->size + 1); char *payload = malloc(response->size + 1);
if (!payload) { if (!payload) {
goto error_2; goto error_2;
@ -112,8 +112,8 @@ char *ipc_single_command(int socketfd, uint32_t type, const char *payload, uint3
char data[ipc_header_size]; char data[ipc_header_size];
uint32_t *data32 = (uint32_t *)(data + sizeof(ipc_magic)); uint32_t *data32 = (uint32_t *)(data + sizeof(ipc_magic));
memcpy(data, ipc_magic, sizeof(ipc_magic)); memcpy(data, ipc_magic, sizeof(ipc_magic));
data32[0] = *len; memcpy(&data32[0], len, sizeof(*len));
data32[1] = type; memcpy(&data32[1], &type, sizeof(type));
if (write(socketfd, data, ipc_header_size) == -1) { if (write(socketfd, data, ipc_header_size) == -1) {
sway_abort("Unable to send IPC header"); sway_abort("Unable to send IPC header");

8
sway/ipc-server.c
View file

@ -253,8 +253,8 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) {
return 0; return 0;
} }
client->payload_length = buf32[0]; memcpy(&client->payload_length, &buf32[0], sizeof(buf32[0]));
client->current_command = (enum ipc_command_type)buf32[1]; memcpy(&client->current_command, &buf32[1], sizeof(buf32[1]));
if (read_available - received >= (long)client->payload_length) { if (read_available - received >= (long)client->payload_length) {
ipc_client_handle_command(client); ipc_client_handle_command(client);
@ -832,8 +832,8 @@ bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t pay
uint32_t *data32 = (uint32_t*)(data + sizeof(ipc_magic)); uint32_t *data32 = (uint32_t*)(data + sizeof(ipc_magic));
memcpy(data, ipc_magic, sizeof(ipc_magic)); memcpy(data, ipc_magic, sizeof(ipc_magic));
data32[0] = payload_length; memcpy(&data32[0], &payload_length, sizeof(payload_length));
data32[1] = client->current_command; memcpy(&data32[1], &client->current_command, sizeof(client->current_command));
while (client->write_buffer_len + ipc_header_size + payload_length >= while (client->write_buffer_len + ipc_header_size + payload_length >=
client->write_buffer_size) { client->write_buffer_size) {