Skip to content

Validate compile() filename type and dont_inherit __bool__ protocol #7768

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

Merged
youknowone merged 1 commit into from
May 4, 2026
Merged

Validate compile() filename type and dont_inherit __bool__ protocol #7768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions Lib/test/test_compile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,6 @@ def f():
d = {f(): f(), f(): f()}
self.assertEqual(d, {1: 2, 3: 4})

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: TypeError not raised
def test_compile_filename(self):
for filename in 'file.py', b'file.py':
code = compile('pass', filename, 'exec')
Expand All @@ -657,7 +656,6 @@ def test_compile_filename(self):
compile('pass', filename, 'exec')
self.assertRaises(TypeError, compile, 'pass', list(b'file.py'), 'exec')

@unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: Expected type bool, not EvilBool
def test_compile_filename_refleak(self):
# Regression tests for reference leak in PyUnicode_FSDecoder.
# See https://github.com/python/cpython/issues/139748.
Expand Down
22 changes: 17 additions & 5 deletions crates/vm/src/stdlib/builtins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,21 @@ mod builtins {
#[allow(dead_code)]
struct CompileArgs {
source: PyObjectRef,
filename: FsPath,
// Resolved to FsPath at the start of compile() so that bytearray /
// memoryview / other buffer-protocol objects raise TypeError, matching
// CPython's PyUnicode_FSDecoder (str / bytes / __fspath__ only).
filename: PyObjectRef,
mode: PyUtf8StrRef,
// CPython parity: flags / optimize accept any object with __index__,
// not just exact int. Matches the behavior of `int(x)` arg conversion
// used by Python/Python-ast.c::compile.
#[pyarg(any, optional)]
flags: OptionalArg<ArgPrimitiveIndex<i32>>,
// CPython parity: dont_inherit goes through PyObject_IsTrue, so
// arbitrary objects with `__bool__` are accepted (and any exception
// raised inside `__bool__` propagates) — not the strict bool type.
#[pyarg(any, optional)]
dont_inherit: OptionalArg<bool>,
dont_inherit: OptionalArg<ArgIntoBool>,
#[pyarg(any, optional)]
optimize: OptionalArg<ArgPrimitiveIndex<i32>>,
#[pyarg(any, optional)]
Expand Down Expand Up @@ -261,6 +267,12 @@ mod builtins {
}
#[cfg(feature = "ast")]
{
// CPython parity: PyUnicode_FSDecoder accepts only str / bytes /
// __fspath__-bearing objects. Reject buffer-protocol types like
// bytearray and memoryview that would otherwise pass through
// `FsPath::TryFromObject`'s permissive fallback.
let filename = FsPath::try_from_path_like(args.filename, true, vm)?;

use crate::{class::PyClassImpl, stdlib::_ast};

let feature_version = feature_version_from_arg(args._feature_version, vm)?;
Expand Down Expand Up @@ -321,7 +333,7 @@ mod builtins {
return _ast::compile(
vm,
args.source,
&args.filename.to_string_lossy(),
&filename.to_string_lossy(),
mode,
Some(optimize),
);
Expand All @@ -342,7 +354,7 @@ mod builtins {
let source = ArgStrOrBytesLike::try_from_object(vm, args.source)?;
let source = source.borrow_bytes();

let source = decode_source_bytes(&source, &args.filename.to_string_lossy(), vm)?;
let source = decode_source_bytes(&source, &filename.to_string_lossy(), vm)?;
let source = source.as_str();

let flags: i32 = args.flags.map_or(0, |v| v.value);
Expand Down Expand Up @@ -389,7 +401,7 @@ mod builtins {
.compile_with_opts(
source,
mode,
args.filename.to_string_lossy().into_owned(),
filename.to_string_lossy().into_owned(),
opts,
)
.map_err(|err| {
Expand Down
Loading