Skip to content

Fix crashes in cupsDNSSDDelete() when Avahi fails to initialize. #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelrsweet merged 1 commit into from
Sep 15, 2026
Merged

Fix crashes in cupsDNSSDDelete() when Avahi fails to initialize. #164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions cups/dnssd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,12 +749,17 @@ cupsDNSSDDelete(cups_dnssd_t *dnssd) // I - DNS-SD context
#elif _WIN32

#else // HAVE_AVAHI
avahi_domain_browser_free(dnssd->dbrowser);
if (dnssd->dbrowser)
avahi_domain_browser_free(dnssd->dbrowser);

cupsThreadCancel(dnssd->monitor);
cupsThreadWait(dnssd->monitor);
if (dnssd->monitor != CUPS_THREAD_INVALID)
{
cupsThreadCancel(dnssd->monitor);
cupsThreadWait(dnssd->monitor);
}

avahi_simple_poll_free(dnssd->poll);
if (dnssd->poll)
avahi_simple_poll_free(dnssd->poll);
#endif // HAVE_MDNSRESPONDER

cupsRWDestroy(&dnssd->rwlock);
Expand Down Expand Up @@ -890,7 +895,6 @@ cupsDNSSDNew(
{
// Unable to create the client...
report_error(dnssd, "Unable to initialize DNS-SD: %s", avahi_strerror(error));
avahi_simple_poll_free(dnssd->poll);
cupsDNSSDDelete(dnssd);
DEBUG_puts("2cupsDNSSDNew: Unable to create Avahi client - returning NULL.");
return (NULL);
Expand Down