From 9d72065fa969e3f0dab8e990f4b9077f98417df0 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Wed, 21 Mar 2018 18:00:18 -0400 Subject: [PATCH] Try another fix for Avahi crash (Issue #5268) --- scheduler/dirsvc.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index 2308e05384..3dab90ca94 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -1,8 +1,8 @@ /* * Directory services routines for the CUPS scheduler. * - * Copyright 2007-2015 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. + * Copyright © 2007-2018 by Apple Inc. + * Copyright © 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -698,20 +698,21 @@ dnssdDeregisterInstance( DNSServiceRefDeallocate(*srv); + *srv = NULL; + # 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); - - if (!from_callback) - avahi_threaded_poll_unlock(DNSSDMaster); + *srv = NULL; } -# endif /* HAVE_DNSSD */ - *srv = NULL; + if (!from_callback) + avahi_threaded_poll_unlock(DNSSDMaster); +# endif /* HAVE_DNSSD */ } -- 2.47.3