Skip to content
This repository has been archived by the owner on Jan 14, 2021. It is now read-only.

Fix recursive dispose #6

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix recursive dispose #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d7fc9b
Protect BrowseService against recursive Dispose()
hyperair Nov 7, 2011
2894e5c
Allow ServiceBrowser.Dispose() to be called again
hyperair Nov 7, 2011
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
10 changes: 7 additions & 3 deletions src/Mono.Zeroconf.Providers.AvahiDBus/Mono.Zeroconf.Providers.AvahiDBus/BrowseService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,23 @@ public BrowseService (string name, string regtype, string replyDomain, int @inte
public void Dispose ()
{
lock (this) {
disposed = true;
DisposeResolver ();
if (!disposed) {
disposed = true;
DisposeResolver ();
}
}
}

private void DisposeResolver ()
{
lock (this) {
IAvahiServiceResolver resolver = this.resolver;

if (resolver != null) {
this.resolver = null;
resolver.Failure -= OnResolveFailure;
resolver.Found -= OnResolveFound;
resolver.Free ();
resolver = null;
}
}
}
Expand Down
25 changes: 16 additions & 9 deletions src/Mono.Zeroconf.Providers.AvahiDBus/Mono.Zeroconf.Providers.AvahiDBus/ServiceBrowser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,21 @@ public class ServiceBrowser : IServiceBrowser
public void Dispose ()
{
lock (this) {
IAvahiServiceBrowser service_browser = this.service_browser;
if (service_browser != null) {
this.service_browser = null;
service_browser.ItemNew -= OnItemNew;
service_browser.ItemRemove -= OnItemRemove;
service_browser.Free ();
}

if (services.Count > 0) {
foreach (BrowseService service in services.Values) {
List<BrowseService> services_list = new List<BrowseService> (services.Values);
services.Clear (); // Clear first so we no-op if we Dispose() again

foreach (BrowseService service in services_list) {
service.Dispose ();
}
services.Clear ();
}
}
}
Expand Down Expand Up @@ -117,10 +121,11 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator ()
{
lock (this) {
BrowseService service = new BrowseService (name, type, domain, @interface, protocol);

if (services.ContainsKey (name)) {
services[name].Dispose ();
BrowseService to_dispose;

if (services.TryGetValue (name, out to_dispose)) {
services[name] = service;
to_dispose.Dispose ();
} else {
services.Add (name, service);
}
Expand All @@ -134,10 +139,12 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator ()
{
lock (this) {
BrowseService service = new BrowseService (name, type, domain, @interface, protocol);

if (services.ContainsKey (name)) {
services[name].Dispose ();
BrowseService to_dispose;

// handler may be called recursively, so remove service from services before disposing
if (services.TryGetValue (name, out to_dispose)) {
services.Remove (name);
to_dispose.Dispose ();
}

OnServiceRemoved (service);
Expand Down