Fix an Avahi-related crash bug in the scheduler (Issue #5085, Issue #5086)

[thirdparty/cups.git] / scheduler / dirsvc.c

diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index 6f6aa8bb446dc38f1ccbd416e39b2ad3771fdfd3..2308e05384bc90552a505590914ce876789b0c6c 100644 (file)
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -699,13 +699,16 @@ dnssdDeregisterInstance(
   DNSServiceRefDeallocate(*srv);
 
 #  else /* HAVE_AVAHI */
-  if (!from_callback)
-    avahi_threaded_poll_lock(DNSSDMaster);
+  if (*srv)
+  {
+    if (!from_callback)
+      avahi_threaded_poll_lock(DNSSDMaster);
 
-  avahi_entry_group_free(*srv);
+    avahi_entry_group_free(*srv);
 
-  if (!from_callback)
-    avahi_threaded_poll_unlock(DNSSDMaster);
+    if (!from_callback)
+      avahi_threaded_poll_unlock(DNSSDMaster);
+  }
 #  endif /* HAVE_DNSSD */
 
   *srv = NULL;