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

[Christophe Fergau]

 src/spice-channel.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit b7ed56622b2039b2c91fc886f58552b4939a121d
Author: Javier Celaya <javier.celaya at flexvdi.com>
Date:   Mon Jul 27 15:06:12 2015 +0200

    Call spice_marshaller_flush on message write
    
    spice_marshaller_flush must be called before writing a message to
    calculate pointer offsets.
    
    This is only an issue when ptr submarshallers are used, which currently
    is only used by Tunnel::service_add. Since this is disabled by default,
    this buug is not going to be hit by the current codebase.

diff --git a/src/spice-channel.c b/src/spice-channel.c
index d8bba5c..a2a6cb9 100644
--- a/src/spice-channel.c
+++ b/src/spice-channel.c
@@ -858,6 +858,7 @@ static void spice_channel_write_msg(SpiceChannel *channel, SpiceMsgOut *out)
         return;
     }
 
+    spice_marshaller_flush(out->marshaller);
     msg_size = spice_marshaller_get_total_size(out->marshaller) -
                spice_header_get_header_size(channel->priv->use_mini_header);
     spice_header_set_msg_size(out->header, channel->priv->use_mini_header, msg_size);