Skip to content

gh-64490: Fix bugs in argument clinic varargs processing #32092

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
erlend-aasland merged 28 commits into from
Nov 24, 2022
Merged

gh-64490: Fix bugs in argument clinic varargs processing #32092

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
6793f38
Fix a bug which allows more than one varargs
colorfulappl Mar 24, 2022
6203962
Fix an array index out-of-bound bug
colorfulappl Mar 24, 2022
03be6f9
Fix a kwarg parse bug
colorfulappl Mar 24, 2022
cefe5e9
Merge branch 'main' into unpack_keywords_bugfix
colorfulappl Aug 11, 2022
45bde03
Regenerate clinic.test
colorfulappl Aug 11, 2022
bfc5241
Replace `pre_buffer` to a more descriptive name `nargs`
colorfulappl Aug 11, 2022
0b1523c
📜🤖 Added by blurb_it.
blurb-it[bot] Aug 11, 2022
411ad37
Replace inline literals with double backticks in news
colorfulappl Aug 11, 2022
c6a5171
Rename news
colorfulappl Aug 11, 2022
42f9273
Merge branch 'main' into unpack_keywords_bugfix
colorfulappl Aug 12, 2022
7fdd501
Simplify news
colorfulappl Aug 12, 2022
0aa4be4
Regenerate clinic.test
colorfulappl Aug 12, 2022
bbad2bb
Add test "allow no more than one vararg"
colorfulappl Aug 15, 2022
f7b6662
Merge branch 'main' into unpack_keywords_bugfix
colorfulappl Aug 15, 2022
4fb66ab
Regenerate clinic.test
colorfulappl Aug 15, 2022
8f11765
Modify news
colorfulappl Aug 15, 2022
de5b2a4
Update 2022-08-11-09-58-15.gh-issue-64490.PjwhM4.rst
erlend-aasland Aug 15, 2022
85f98ca
Sphinx syntax/format fix
erlend-aasland Aug 15, 2022
58a3da5
Missing blank line
erlend-aasland Aug 15, 2022
0afce9d
Merge branch 'main' into unpack_keywords_bugfix
colorfulappl Nov 23, 2022
87314ff
Add Argument Clinic functional test cases
colorfulappl Nov 24, 2022
a48971d
Fix bug
colorfulappl Nov 24, 2022
e6a4e13
Do not generate unused `noptargs`
colorfulappl Nov 24, 2022
8592676
Update news
colorfulappl Nov 24, 2022
4c682bf
Update Lib/test/clinic.test
colorfulappl Nov 24, 2022
c3d6b73
Delete unnecessary function doc
colorfulappl Nov 24, 2022
8b26eb8
Merge branch 'main' into unpack_keywords_bugfix
colorfulappl Nov 24, 2022
3f88c54
Rerun make clinic
colorfulappl Nov 24, 2022
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
Prev Previous commit
Next Next commit
Replace pre_buffer to a more descriptive name nargs
  • Loading branch information
@colorfulappl
colorfulappl committed Aug 11, 2022
commit bfc524195b1192b2cf8afc78a711149fb5c3b08c
8 changes: 4 additions & 4 deletions Tools/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,15 +956,15 @@ def parser_body(prototype, *fields, declarations=''):
max_pos,
min_kw_only
)
pre_buffer = "nargs"
nargs = "nargs"
else:
args_declaration = "_PyArg_UnpackKeywordsWithVararg", "%s, %s, %s, %s" % (
min_pos,
max_pos,
min_kw_only,
vararg
)
pre_buffer = f"Py_MIN(nargs, {max_pos})" if max_pos else "0"
nargs = f"Py_MIN(nargs, {max_pos})" if max_pos else "0"
if not new_or_init:
flags = "METH_FASTCALL|METH_KEYWORDS"
parser_prototype = parser_prototype_fastcall_keywords
Expand All @@ -975,7 +975,7 @@ def parser_body(prototype, *fields, declarations=''):
PyObject *argsbuf[%s];
""" % len(converters))
if has_optional_kw:
declarations += "\nPy_ssize_t noptargs = %s + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - %d;" % (pre_buffer, min_pos + min_kw_only)
declarations += "\nPy_ssize_t noptargs = %s + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - %d;" % (nargs, min_pos + min_kw_only)
parser_code = [normalize_snippet("""
args = %s(args, nargs, NULL, kwnames, &_parser, %s, argsbuf);
if (!args) {{
Expand All @@ -995,7 +995,7 @@ def parser_body(prototype, *fields, declarations=''):
Py_ssize_t nargs = PyTuple_GET_SIZE(args);
""" % len(converters))
if has_optional_kw:
declarations += "\nPy_ssize_t noptargs = %s + (kwargs ? PyDict_GET_SIZE(kwargs) : 0) - %d;" % (pre_buffer, min_pos + min_kw_only)
declarations += "\nPy_ssize_t noptargs = %s + (kwargs ? PyDict_GET_SIZE(kwargs) : 0) - %d;" % (nargs, min_pos + min_kw_only)
parser_code = [normalize_snippet("""
fastargs = %s(_PyTuple_CAST(args)->ob_item, nargs, kwargs, NULL, &_parser, %s, argsbuf);
if (!fastargs) {{
Expand Down