]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
rpc: Fix reference counting around virNetSocketAddIOCallback
authorDaniel P. Berrange <berrange@redhat.com>
Thu, 4 Jun 2015 17:18:56 +0000 (19:18 +0200)
committerMartin Kletzander <mkletzan@redhat.com>
Fri, 5 Jun 2015 11:48:05 +0000 (13:48 +0200)
Ref service passed as a parameter to the callback.  And don't unref the
socket that is part of the service being passed at another point in code.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
src/rpc/virnetserverservice.c

index d84b6defd4e5ba12e0d586c5e2cad072ee2bb775..9087473efd399a26756d2103d7519f2b74c5187f 100644 (file)
@@ -301,12 +301,15 @@ virNetServerServicePtr virNetServerServiceNewFD(int fd,
 
         /* IO callback is initially disabled, until we're ready
          * to deal with incoming clients */
+        virObjectRef(svc);
         if (virNetSocketAddIOCallback(svc->socks[i],
                                       0,
                                       virNetServerServiceAccept,
                                       svc,
-                                      virObjectFreeCallback) < 0)
+                                      virObjectFreeCallback) < 0) {
+            virObjectUnref(svc);
             goto error;
+        }
     }
 
 
@@ -386,7 +389,6 @@ virNetServerServicePtr virNetServerServiceNewPostExecRestart(virJSONValuePtr obj
                                       svc,
                                       virObjectFreeCallback) < 0) {
             virObjectUnref(svc);
-            virObjectUnref(sock);
             goto error;
         }
     }