Skip to content

Fix closerange empty ranges before unsigned conversion #9031

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
youknowdot wants to merge 3 commits into
base: main
Choose a base branch
from
+51 −2
Draft

Fix closerange empty ranges before unsigned conversion #9031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1fc7e8
Fix closerange empty ranges before unsigned conversion
youknowdot Oct 16, 2026
5067bb3
Fix deprecated PyO3 code input import in benchmarks
youknowdot Oct 16, 2026
5bc1814
Scope closerange reference exclusion to affected CPython build
youknowdot Oct 16, 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
2 changes: 1 addition & 1 deletion benches/execution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use criterion::{
Bencher, BenchmarkGroup, BenchmarkId, Criterion, Throughput, criterion_group, criterion_main,
measurement::WallTime,
};
use pyo3::types::{PyCode, PyCodeInput, PyCodeMethods, PyDict, PyDictMethods};
use pyo3::types::{PyCode, PyCodeMethods, PyDict, PyDictMethods, code::PyCodeInput};
use rustpython_compiler::Mode;
use rustpython_vm::{Interpreter, PyResult, Settings};
use std::{collections::HashMap, path::Path};
Expand Down
2 changes: 1 addition & 1 deletion crates/host_env/src/crt_fd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ pub fn closerange(fd_low: Raw, fd_high: Raw) {
// CPython clamps low to 0.
let fd_low = fd_low.max(0);
// close_range(2) is [low, high] whereas CPython's is [low, high).
if fd_high < fd_low {
if fd_high <= fd_low {
return;
}
let high = fd_high - 1;
Expand Down
49 changes: 49 additions & 0 deletions extra_tests/snippets/stdlib_os.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import itertools
import os
import stat
import subprocess
import sys
import time

Expand Down Expand Up @@ -113,6 +114,54 @@ def __index__(self):
chmod_supports_directory_descriptors()


# Run in a child: a broken empty-range implementation can close every descriptor.
subprocess.run(
[
sys.executable,
"-c",
"""
import errno
import os
import sys

known_reference_bug = (
sys.implementation.name == "cpython"
and sys.platform == "linux"
and sys.version_info == (3, 15, 0, "final", 0)
)
if known_reference_bug:
import sysconfig
known_reference_bug = bool(sysconfig.get_config_var("HAVE_CLOSE_RANGE"))

sentinel = os.open(os.devnull, os.O_RDONLY)
for low, high in ((0, 0), (-1, 0), (sentinel, sentinel),
(sentinel + 1, sentinel), (-2, -1)):
# TODO: remove once the reference includes python/cpython#159183.
# https://github.com/python/cpython/issues/159182
if known_reference_bug and (low, high) in ((0, 0), (-1, 0), (-2, -1)):
continue
os.closerange(low, high)
os.fstat(sentinel)

target = os.open(os.devnull, os.O_RDONLY)
other = os.open(os.devnull, os.O_RDONLY)
os.closerange(target, target + 1)
os.fstat(sentinel)
os.fstat(other)
try:
os.fstat(target)
except OSError as exc:
assert exc.errno == errno.EBADF
else:
raise AssertionError("closerange did not close its single descriptor")
os.close(other)
os.close(sentinel)
""",
],
check=True,
)


fd = os.open("README.md", os.O_RDONLY)
assert fd > 0

Expand Down
Loading