[Spice-commits] src/spice-session.c

[GitLab Mirror]

 src/spice-session.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit efc284ec6fdbb5f75af5c7798d50eaf8177b649e
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Sep 5 14:15:32 2019 +0100

    spice-session: Fix SWAP_STR macro
    
    Really swap "x" and "y", not temporary copies.
    The issue was introduced by 01c6343 "Use macro to swap
    data in spice_session_start_migrating()".
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/src/spice-session.c b/src/spice-session.c
index 04ba124..d0d9e54 100644
--- a/src/spice-session.c
+++ b/src/spice-session.c
@@ -1742,12 +1742,9 @@ void spice_session_switching_disconnect(SpiceSession *self)
 }
 
 #define SWAP_STR(x, y) G_STMT_START { \
-    const gchar *tmp;                 \
-    const gchar *a = x;               \
-    const gchar *b = y;               \
-    tmp = a;                          \
-    a = b;                            \
-    b = tmp;                          \
+    gchar *tmp = x;                   \
+    x = y;                            \
+    y = tmp;                          \
 } G_STMT_END
 
 G_GNUC_INTERNAL