[Spice-commits] 2 commits - server/smartcard.c

[GitLab Mirror]

 server/smartcard.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ebe676697f8727057a5c64ec06fd75ae92ccc56a
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Wed Oct 9 20:34:16 2019 +0100

    smartcard: Reset vheader value
    
    The buffer could change inside smartcard_read_buf_prepare.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/server/smartcard.c b/server/smartcard.c
index d62847d6..961633f0 100644
--- a/server/smartcard.c
+++ b/server/smartcard.c
@@ -151,6 +151,7 @@ static RedPipeItem *smartcard_read_msg_from_device(RedCharDevice *self,
                 continue;
             }
             smartcard_read_buf_prepare(dev, vheader);
+            vheader = (VSCMsgHeader*)dev->priv->buf;
         }
         actual_length = ntohl(vheader->length);
         if (dev->priv->buf_used - sizeof(VSCMsgHeader) < actual_length) {
commit 60a61be5497cf9088b0522d27f2bd82bdfca5acc
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Wed Oct 9 20:33:27 2019 +0100

    smartcard: Fix statement termination
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Victor Toso <victortoso at redhat.com>

diff --git a/server/smartcard.c b/server/smartcard.c
index 340118e1..d62847d6 100644
--- a/server/smartcard.c
+++ b/server/smartcard.c
@@ -559,7 +559,7 @@ red_smartcard_channel_class_init(RedSmartcardChannelClass *klass)
     object_class->constructed = red_smartcard_channel_constructed;
 
     channel_class->parser = spice_get_client_channel_parser(SPICE_CHANNEL_SMARTCARD, NULL);
-    channel_class->handle_message = smartcard_channel_client_handle_message,
+    channel_class->handle_message = smartcard_channel_client_handle_message;
 
     channel_class->send_item = smartcard_channel_send_item;
     channel_class->handle_migrate_flush_mark = smartcard_channel_client_handle_migrate_flush_mark;