mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

Disallow __debug__ as args, kwargs name.

Browse Source
This commit is contained in:
DimitrisJim
2023-03-01 11:48:45 +02:00
parent a0472e11a9
commit 8294d4ae8e
2 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
compiler/codegen/src/compile.rs
View File

@@ -315,8 +315,13 @@ impl Compiler {
fn name(&mut self, name: &str) -> bytecode::NameIdx {
self._name_inner(name, |i| &mut i.name_cache)
}
fn varname(&mut self, name: &str) -> bytecode::NameIdx {
self._name_inner(name, |i| &mut i.varname_cache)
fn varname(&mut self, name: &str) -> CompileResult<bytecode::NameIdx> {
if Compiler::is_forbidden_arg_name(name) {
return Err(self.error(CodegenErrorType::SyntaxError(format!(
"cannot assign to {name}",
))));
}
Ok(self._name_inner(name, |i| &mut i.varname_cache))
}
fn _name_inner(
&mut self,
@@ -942,24 +947,17 @@ impl Compiler {
.chain(&args.args)
.chain(&args.kwonlyargs);
for name in args_iter {
if Compiler::is_forbidden_arg_name(&name.node.arg) {
return Err(self.error(CodegenErrorType::SyntaxError(format!(
"cannot assign to {}",
&name.node.arg
))));
}
self.varname(&name.node.arg);
self.varname(&name.node.arg)?;
}
let mut compile_varargs = |va: Option<&ast::Arg>, flag| {
if let Some(name) = va {
self.current_codeinfo().flags |= flag;
self.varname(&name.node.arg);
}
};
compile_varargs(args.vararg.as_deref(), bytecode::CodeFlags::HAS_VARARGS);
compile_varargs(args.kwarg.as_deref(), bytecode::CodeFlags::HAS_VARKEYWORDS);
if let Some(name) = args.vararg.as_deref() {
self.current_codeinfo().flags |= bytecode::CodeFlags::HAS_VARARGS;
self.varname(&name.node.arg)?;
}
if let Some(name) = args.kwarg.as_deref() {
self.current_codeinfo().flags |= bytecode::CodeFlags::HAS_VARKEYWORDS;
self.varname(&name.node.arg)?;
}
Ok(funcflags)
}
@@ -2565,7 +2563,7 @@ impl Compiler {
0,
name.to_owned(),
);
let arg0 = self.varname(".0");
let arg0 = self.varname(".0")?;
let return_none = init_collection.is_none();
// Create empty object of proper type:

26
extra_tests/snippets/syntax_forbidden_name.py Normal file
View File

@@ -0,0 +1,26 @@
from testutils import assert_raises
def raisesSyntaxError(parse_stmt, exec_stmt=None):
with assert_raises(SyntaxError):
compile(parse_stmt, '<test>', 'exec')
if exec_stmt is not None:
source = "\n".join([parse_stmt, exec_stmt])
exec(source)
# Check that errors are raised during parsing.
raisesSyntaxError("def f(**__debug__): pass")
raisesSyntaxError("def f(*__debug__): pass")
raisesSyntaxError("def f(__debug__): pass")
raisesSyntaxError("def f(__debug__=1): pass")
# Similarly but during execution.
raisesSyntaxError("def f(**kwargs): pass", "f(__debug__=1)")
raisesSyntaxError("", "__debug__=1")
raisesSyntaxError("", "obj.__debug__ = 1")
raisesSyntaxError("", "__debug__ := 1")
raisesSyntaxError("", "del __debug__")
raisesSyntaxError("", "(a, __debug__, c) = (1, 2, 3)")
raisesSyntaxError("", "(a, *__debug__, c) = (1, 2, 3)")
# TODO:
# raisesSyntaxError("", "__debug__ : int")