Skip to contentSkip to conversation

vnc: Fix a memleak in vnc_display_connect()

PATCH Applied Alex Chen 3 participants 4 messages Nov 26, 2020 – Jan 12, 2021

lore
Share & tools
lore

Alex Chen

author
#0 lore raw

PATCH 1/1 vnc: Fix a memleak in vnc_display_connect()

Free the 'sioc' when the qio_channel_socket_connect_sync() fails.

---
 ui/vnc.c | 1 +
 1 file changed, 1 insertion(+)
ui/vnc.c +1 -0
index 49235056f7..dae56e9493 100644
@@ -3743,6 +3743,7 @@ static int vnc_display_connect(VncDisplay *vd,
     sioc = qio_channel_socket_new();
     qio_channel_set_name(QIO_CHANNEL(sioc), "vnc-reverse");
     if (qio_channel_socket_connect_sync(sioc, saddr[0], errp) < 0) {
+        object_unref(OBJECT(sioc));
         return -1;
     }
     vnc_connect(vd, sioc, false, false);
Signature · 1 line
2.19.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Alex Chen <[email protected]> 于2020年11月26日周四 下午3:10写道:

Free the 'sioc' when the qio_channel_socket_connect_sync() fails.

Quoted 20 lines
---
 ui/vnc.c | 1 +
 1 file changed, 1 insertion(+)
ui/vnc.c +1 -1
index 49235056f7..dae56e9493 100644
@@ -3743,6 +3743,7 @@ static int vnc_display_connect(VncDisplay *vd,
     sioc = qio_channel_socket_new();
     qio_channel_set_name(QIO_CHANNEL(sioc), "vnc-reverse");
     if (qio_channel_socket_connect_sync(sioc, saddr[0], errp) < 0) {
+        object_unref(OBJECT(sioc));
         return -1;
     }
     vnc_connect(vd, sioc, false, false);
--

2.19.1

Reviewed-by on v1 1/1
#2 lore raw
In reply to Alex Chen

Le 26/11/2020 à 07:57, Alex Chen a écrit :

Quoted 14 lines

Free the 'sioc' when the qio_channel_socket_connect_sync() fails.

---
 ui/vnc.c | 1 +
 1 file changed, 1 insertion(+)
ui/vnc.c +0 -0
index 49235056f7..dae56e9493 100644

ui/vnc.c static int vnc_display_connect(VncDisplay *vd, · line 3749

Quoted 7 lines
ui/vnc.c +1 -0
@@ -3743,6 +3743,7 @@ static int vnc_display_connect(VncDisplay *vd,
     sioc = qio_channel_socket_new();
     qio_channel_set_name(QIO_CHANNEL(sioc), "vnc-reverse");
     if (qio_channel_socket_connect_sync(sioc, saddr[0], errp) < 0) {
+        object_unref(OBJECT(sioc));
         return -1;
     }
     vnc_connect(vd, sioc, false, false);
#3 lore raw
In reply to Alex Chen

Le 26/11/2020 à 07:57, Alex Chen a écrit :

Quoted 14 lines

Free the 'sioc' when the qio_channel_socket_connect_sync() fails.

---
 ui/vnc.c | 1 +
 1 file changed, 1 insertion(+)
ui/vnc.c +0 -0
index 49235056f7..dae56e9493 100644

ui/vnc.c static int vnc_display_connect(VncDisplay *vd, · line 3749

Quoted 7 lines
ui/vnc.c +1 -0
@@ -3743,6 +3743,7 @@ static int vnc_display_connect(VncDisplay *vd,
     sioc = qio_channel_socket_new();
     qio_channel_set_name(QIO_CHANNEL(sioc), "vnc-reverse");
     if (qio_channel_socket_connect_sync(sioc, saddr[0], errp) < 0) {
+        object_unref(OBJECT(sioc));
         return -1;
     }
     vnc_connect(vd, sioc, false, false);

Applied to my trivial-patches branch.

Thanks,
Laurent