Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

gh-140652: Fix a crash in _interpchannels.list_all() after closing a channel #143743

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.

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

Open
serhiy-storchaka wants to merge 1 commit into python:main
base: main
Choose a base branch
Loading
from serhiy-storchaka:channels_list_all_closed
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions Lib/test/test__interpchannels.py
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,38 @@ def test_sequential_ids(self):
self.assertEqual(id3, int(id2) + 1)
self.assertEqual(set(after) - set(before), {id1, id2, id3})

def test_channel_list_all_closed(self):
id1 = _channels.create()
id2 = _channels.create()
id3 = _channels.create()
before = _channels.list_all()
expected = [info for info in before if info[0] != id2]
_channels.close(id2, force=True)
after = _channels.list_all()
self.assertEqual(set(after), set(expected))
self.assertEqual(len(after), len(before) - 1)

def test_channel_list_all_destroyed(self):
id1 = _channels.create()
id2 = _channels.create()
id3 = _channels.create()
before = _channels.list_all()
expected = [info for info in before if info[0] != id2]
_channels.destroy(id2)
after = _channels.list_all()
self.assertEqual(set(after), set(expected))
self.assertEqual(len(after), len(before) - 1)

def test_channel_list_all_released(self):
id1 = _channels.create()
id2 = _channels.create()
id3 = _channels.create()
before = _channels.list_all()
_channels.release(id2, send=True, recv=True)
after = _channels.list_all()
self.assertEqual(set(after), set(before))
self.assertEqual(len(after), len(before))

def test_ids_global(self):
id1 = _interpreters.create()
out = _run_output(id1, dedent("""
Expand Down
6 changes: 6 additions & 0 deletions Lib/test/test_interpreters/test_channels.py
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ def test_list_all(self):
after = set(channels.list_all())
self.assertEqual(after, created)

def test_list_all_closed(self):
created = [channels.create() for _ in range(3)]
rch, sch = created.pop(1)
rch.close()
self.assertEqual(set(channels.list_all()), set(created))

def test_shareable(self):
interp = interpreters.create()
rch, sch = channels.create()
Expand Down
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a crash in :func:`!_interpchannels.list_all` after closing a channel.
16 changes: 9 additions & 7 deletions Modules/_interpchannelsmodule.c
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,14 +1644,16 @@ _channels_list_all(_channels *channels, int64_t *count)
if (ids == NULL) {
goto done;
}
_channelref *ref = channels->head;
for (int64_t i=0; ref != NULL; ref = ref->next, i++) {
ids[i] = (struct channel_id_and_info){
.id = ref->cid,
.defaults = ref->chan->defaults,
};
int64_t i = 0;
for (_channelref *ref = channels->head; ref != NULL; ref = ref->next) {
if (ref->chan != NULL) {
ids[i++] = (struct channel_id_and_info){
.id = ref->cid,
.defaults = ref->chan->defaults,
};
}
}
*count = channels->numopen;
*count = i;

cids = ids;
done:
Expand Down
Loading

AltStyle によって変換されたページ (->オリジナル) /