Skip to content

Commit aa2c4ed

Browse files
authored
Merge branch 'main' into pythongh-115627
2 parents afb2268 + 63d6f26 commit aa2c4ed

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Lib/test/test_glob.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ def setUp(self):
4141
os.symlink(self.norm('broken'), self.norm('sym1'))
4242
os.symlink('broken', self.norm('sym2'))
4343
os.symlink(os.path.join('a', 'bcd'), self.norm('sym3'))
44+
self.open_dirfd()
45+
46+
def open_dirfd(self):
47+
if self.dir_fd is not None:
48+
os.close(self.dir_fd)
4449
if {os.open, os.stat} <= os.supports_dir_fd and os.scandir in os.supports_fd:
4550
self.dir_fd = os.open(self.tempdir, os.O_RDONLY | os.O_DIRECTORY)
4651
else:
@@ -350,6 +355,10 @@ def test_glob_non_directory(self):
350355
def test_glob_named_pipe(self):
351356
path = os.path.join(self.tempdir, 'mypipe')
352357
os.mkfifo(path)
358+
359+
# gh-117127: Reopen self.dir_fd to pick up directory changes
360+
self.open_dirfd()
361+
353362
self.assertEqual(self.rglob('mypipe'), [path])
354363
self.assertEqual(self.rglob('mypipe*'), [path])
355364
self.assertEqual(self.rglob('mypipe', ''), [])

Modules/_io/bytesio.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,6 @@ resize_buffer(bytesio *self, size_t size)
155155
alloc = size + 1;
156156
}
157157

158-
if (alloc > ((size_t)-1) / sizeof(char))
159-
goto overflow;
160-
161158
if (SHARED_BUF(self)) {
162159
if (unshare_buffer(self, alloc) < 0)
163160
return -1;

0 commit comments

Comments
 (0)