From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 24 Mar 2021 15:49:39 +0000 (+0100)
Subject: virnetsocket: Revert part of g_steal_pointer() rewrite
X-Git-Tag: v7.2.0-rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af09d7a37a60e9ba5f98670e1dd0fd05bb25f786;p=thirdparty%2Flibvirt.git

virnetsocket: Revert part of g_steal_pointer() rewrite

Turns out, the way that glib implements g_steal_pointer() is not
compatible with function callbacks. And that's what my recent
patch did in virNetSocketEventFree(). Revert that part.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 5675c0769d..b1f47636d1 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -2156,9 +2156,10 @@ static void virNetSocketEventFree(void *opaque)
     void *eopaque;
 
     virObjectLock(sock);
-    ff = g_steal_pointer(&sock->ff);
+    ff = sock->ff;
     eopaque = g_steal_pointer(&sock->opaque);
     sock->func = NULL;
+    sock->ff = NULL;
     virObjectUnlock(sock);
 
     if (ff)