[Qemu-devel] [PATCH] Fix crash when connecting to VNC through websocket

[Qemu-devel] [PATCH] Fix crash when connecting to VNC through websocket

[Jorge Acereda Maciá]

Connecting to VNC through websocket crashes in vnc_flush() when trying
to acquire a mutex that hasn't been initialized (vnc_init_state(vs)
hasn't been called at this point).
 
Signed-off-by: Jorge Acereda Macia <jacereda@gmail.com>

---
 ui/vnc-ws.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
index e304baf..30cb3ae 100644
--- a/ui/vnc-ws.c
+++ b/ui/vnc-ws.c
@@ -208,7 +208,7 @@ static void vncws_send_handshake_response(VncState *vs, const char* key)
 
     response = g_strdup_printf(WS_HANDSHAKE, accept);
     vnc_write(vs, response, strlen(response));
-    vnc_flush(vs);
+    vnc_client_write_ws(vs);
 
     g_free(accept);
     g_free(response);
-- 
1.9.3 (Apple Git-50)

Re: [Qemu-devel] [PATCH] Fix crash when connecting to VNC through websocket

[Gerd Hoffmann]

On So, 2015-02-22 at 22:58 +0100, Jorge Acereda Maciá wrote:
> Connecting to VNC through websocket crashes in vnc_flush() when trying
> to acquire a mutex that hasn't been initialized (vnc_init_state(vs)
> hasn't been called at this point).

Added to vnc queue.

thanks,
  Gerd

[Qemu-devel] [PATCH] Fix crash when connecting to VNC through websocket

[Jorge Acereda Maciá]

Please, forget my previous patch, worked somehow with Chrome but failed with Safari (with a good reason, the sent headers were incorrect). This one should be correct and simpler.

Signed-off-by: Jorge Acereda Macia <jacereda@gmail.com>

---
 ui/vnc-ws.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
index e304baf..d75950d 100644
--- a/ui/vnc-ws.c
+++ b/ui/vnc-ws.c
@@ -207,8 +207,7 @@ static void vncws_send_handshake_response(VncState *vs, const char* key)
     }
 
     response = g_strdup_printf(WS_HANDSHAKE, accept);
-    vnc_write(vs, response, strlen(response));
-    vnc_flush(vs);
+    vnc_client_write_buf(vs, (const uint8_t *)response, strlen(response));
 
     g_free(accept);
     g_free(response);
-- 
1.9.3 (Apple Git-50)

Re: [Qemu-devel] [PATCH] Fix crash when connecting to VNC through websocket

[Peter Crosthwaite]

The subject should read V2 as this is a resubmit. Use git format-patch
--subject-prefix="PATCH v2".

On Mon, Feb 23, 2015 at 4:29 PM, Jorge Acereda Maciá <jacereda@gmail.com> wrote:
> Please, forget my previous patch, worked somehow with Chrome but failed with Safari (with a good reason, the sent headers were incorrect). This one should be correct and simpler.
>

You should also start a fresh with your commit message content. Don't
mention discarded versions of the patch or changes in your patch
content. Just say what the patch does. Your v1 commit message looks
good and coulld probably be reused as-is.

> Signed-off-by: Jorge Acereda Macia <jacereda@gmail.com>
>
> ---

But you put you patch change log here, below the "---". This allows
reviewers to see your change information, but git will discard the
changlog on application of the final accepted version.

Regards,
Peter

>  ui/vnc-ws.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
> index e304baf..d75950d 100644
> --- a/ui/vnc-ws.c
> +++ b/ui/vnc-ws.c
> @@ -207,8 +207,7 @@ static void vncws_send_handshake_response(VncState *vs, const char* key)
>      }
>
>      response = g_strdup_printf(WS_HANDSHAKE, accept);
> -    vnc_write(vs, response, strlen(response));
> -    vnc_flush(vs);
> +    vnc_client_write_buf(vs, (const uint8_t *)response, strlen(response));
>
>      g_free(accept);
>      g_free(response);
> --
> 1.9.3 (Apple Git-50)
>
>
>

Re: [Qemu-devel] [PATCH] Fix crash when connecting to VNC through websocket

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 403 bytes --]

On 02/23/2015 11:09 PM, Peter Crosthwaite wrote:
> The subject should read V2 as this is a resubmit. Use git format-patch
> --subject-prefix="PATCH v2".

Or shorter,

git format-patch -v2

Also, remember that 'git send-email' will take any options understood by
'git format-patch'.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]