summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrediano Ziglio <fziglio@redhat.com>2018-09-07 16:27:54 +0100
committerFrediano Ziglio <fziglio@redhat.com>2018-09-10 12:44:17 +0200
commit90f95c2f8c57bdbb2cdc54587aaf9542b523934c (patch)
tree40449e26414938dfd6d04b071653ec8af9c8c1a3
parent6b93b3fce8909b836ef1d1434d191900d8aa00be (diff)
quic: Prevent side effects calling C macros
In some architectures GLib macros to change endianness use the argument multiple times causing possible side effects. This happens for instance using Debian SID and MIPS. This fixes https://gitlab.freedesktop.org/spice/spice-common/issues/1. Reported-by: Laurent Bigonville <bigon@debian.org> Tested-by: Laurent Bigonville <bigon@debian.org> Signed-off-by: Frediano Ziglio <fziglio@redhat.com> Acked-by: Victor Toso <victortoso@redhat.com>
-rw-r--r--common/quic.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/common/quic.c b/common/quic.c
index 60818c2..c28974e 100644
--- a/common/quic.c
+++ b/common/quic.c
@@ -452,7 +452,8 @@ static inline void read_io_word(Encoder *encoder)
if (spice_extra_checks) {
spice_assert(encoder->io_now < encoder->io_end);
}
- encoder->io_next_word = GUINT32_FROM_LE(*(encoder->io_now++));
+ encoder->io_next_word = GUINT32_FROM_LE(*(encoder->io_now));
+ encoder->io_now++;
}
static inline void decode_eatbits(Encoder *encoder, int len)
@@ -585,7 +586,8 @@ static int decode_state_run(Encoder *encoder, CommonState *state)
static inline void init_decode_io(Encoder *encoder)
{
- encoder->io_next_word = encoder->io_word = GUINT32_FROM_LE(*(encoder->io_now++));
+ encoder->io_next_word = encoder->io_word = GUINT32_FROM_LE(*(encoder->io_now));
+ encoder->io_now++;
encoder->io_available_bits = 0;
}