diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-02 18:54:11 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-02 18:54:11 +0000 |
| commit | f24ee107a07f093bd7ed475dd48d7ba57ea3d8fe (patch) | |
| tree | 07eb050833142a5d154dd4820ff5b63227643434 /ui/vnc-auth-sasl.c | |
| parent | fb2516ef94b8399ddded4a41c4346cbc1d5d98fc (diff) | |
| parent | 627ebec208a8809818589e17f4fce55a59420ad2 (diff) | |
| download | focaccia-qemu-f24ee107a07f093bd7ed475dd48d7ba57ea3d8fe.tar.gz focaccia-qemu-f24ee107a07f093bd7ed475dd48d7ba57ea3d8fe.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180202-pull-request' into staging
ui: use QIONetListener in vnc, bugfixes for sdl1 and vnc. # gpg: Signature made Fri 02 Feb 2018 07:17:36 GMT # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20180202-pull-request: ui: correctly advance output buffer when writing SASL data ui: convert VNC server to QIONetListener ui: fix mixup between qnum and qcode in SDL1 key handling Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/vnc-auth-sasl.c')
| -rw-r--r-- | ui/vnc-auth-sasl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c index 74a5f513f2..fbccca8c8a 100644 --- a/ui/vnc-auth-sasl.c +++ b/ui/vnc-auth-sasl.c @@ -84,7 +84,7 @@ size_t vnc_client_write_sasl(VncState *vs) } else { vs->force_update_offset -= vs->sasl.encodedRawLength; } - vs->output.offset -= vs->sasl.encodedRawLength; + buffer_advance(&vs->output, vs->sasl.encodedRawLength); vs->sasl.encoded = NULL; vs->sasl.encodedOffset = vs->sasl.encodedLength = 0; } |