Skip to content

fix: tolerate removing unregistered record listener #1783

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

Draft
bluetoothbot wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −4
Draft

fix: tolerate removing unregistered record listener #1783

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
cd765e8
test: pin async_remove_listener tolerance of unregistered listener
bluetoothbot May 26, 2026
fbed0b8
fix: tolerate removing unregistered listener (GHSA-5pv9-xcmm-gqc7)
bluetoothbot May 26, 2026
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
6 changes: 2 additions & 4 deletions src/zeroconf/_handlers/record_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,6 @@ def async_remove_listener(self, listener: RecordUpdateListener) -> None:

This function is not threadsafe and must be called in the eventloop.
"""
try:
self.listeners.remove(listener)
if listener in self.listeners:
self.listeners.discard(listener)
self.zc.async_notify_all()
except ValueError as e:
log.exception("Failed to remove listener: %r", e)
14 changes: 14 additions & 0 deletions tests/test_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2107,3 +2107,17 @@ def async_update_records_complete(self) -> None:
# This should not raise RuntimeError: set changed size during iteration
zc.record_manager.async_updates_complete(False)
await aiozc.async_close()


@pytest.mark.asyncio
async def test_async_remove_listener_missing_does_not_raise():
"""Removing a listener that was never registered must not raise."""

aiozc = AsyncZeroconf(interfaces=["127.0.0.1"])
zc: Zeroconf = aiozc.zeroconf

listener = r.RecordUpdateListener()

zc.record_manager.async_remove_listener(listener)

await aiozc.async_close()
Loading