diff options
| author | Jakub Adam <jakub.adam@collabora.com> | 2019-01-03 09:50:25 +0100 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@ocrete.ca> | 2019-01-04 23:40:18 +0000 |
| commit | 603ab1d45d0103fc51031152a10ddbdaf7dadf86 (patch) | |
| tree | ba9a7863fc40e3d96eec6442607cee67f53a16f5 | |
| parent | 3ec9f7eb060f904663911eb90ed7edffeeb6d24b (diff) | |
| download | libnice-603ab1d45d0103fc51031152a10ddbdaf7dadf86.tar.gz | |
udp-turn: Fix unaligned memory access on ARM
| -rw-r--r-- | socket/udp-turn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/socket/udp-turn.c b/socket/udp-turn.c index bf81fd9..1bc5e03 100644 --- a/socket/udp-turn.c +++ b/socket/udp-turn.c @@ -362,7 +362,7 @@ socket_recv_messages (NiceSocket *sock, guint f_buffer_len = priv->fragment_buffer->len; for (i = 0; i < n_recv_messages && f_buffer_len >= sizeof (guint16); ++i) { - guint16 msg_len = ntohs (*(guint16 *)f_buffer) + sizeof (guint16); + guint16 msg_len = ((f_buffer[0] << 8) | f_buffer[1]) + sizeof (guint16); if (msg_len > f_buffer_len) { /* The next message in the buffer isn't complete yet. Wait for more @@ -452,7 +452,7 @@ socket_recv_messages (NiceSocket *sock, * return. */ guint16 msg_len = 0; if (!priv->fragment_buffer) { - msg_len = ntohs (*(guint16 *)buffer) + sizeof (guint16); + msg_len = ((buffer[0] << 8) | buffer[1]) + sizeof (guint16); if (msg_len > parsed_buffer_length) { /* The RFC4571 frame is larger than the current TURN message, need to * buffer it and wait for more data. */ |