Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-117376: Fix off-by-ones in conversion functions (GH-124301) 

Fix off-by-ones in conversion function
This commit is contained in:
Ken Jin 2024-09-26 02:41:07 +08:00 committed by GitHub
parent c1600c78e4
commit 198756b0f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Python/bytecodes.c
View File

@ -3928,7 +3928,7 @@ dummy_func(
PyCFunctionFastWithKeywords cfunc = PyCFunctionFastWithKeywords cfunc =
(PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth; (PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
STACKREFS_TO_PYOBJECTS(args, nargs, args_o); STACKREFS_TO_PYOBJECTS(args, total_args, args_o);
if (CONVERSION_FAILED(args_o)) { if (CONVERSION_FAILED(args_o)) {
DECREF_INPUTS(); DECREF_INPUTS();
ERROR_IF(true, error); ERROR_IF(true, error);
@ -4009,7 +4009,7 @@ dummy_func(
(PyCFunctionFast)(void(*)(void))meth->ml_meth; (PyCFunctionFast)(void(*)(void))meth->ml_meth;
int nargs = total_args - 1; int nargs = total_args - 1;
STACKREFS_TO_PYOBJECTS(args, nargs, args_o); STACKREFS_TO_PYOBJECTS(args, total_args, args_o);
if (CONVERSION_FAILED(args_o)) { if (CONVERSION_FAILED(args_o)) {
DECREF_INPUTS(); DECREF_INPUTS();
ERROR_IF(true, error); ERROR_IF(true, error);

4
Python/executor_cases.c.h generated
View File

@ -4596,7 +4596,7 @@
int nargs = total_args - 1; int nargs = total_args - 1;
PyCFunctionFastWithKeywords cfunc = PyCFunctionFastWithKeywords cfunc =
(PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth; (PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
STACKREFS_TO_PYOBJECTS(args, nargs, args_o); STACKREFS_TO_PYOBJECTS(args, total_args, args_o);
if (CONVERSION_FAILED(args_o)) { if (CONVERSION_FAILED(args_o)) {
PyStackRef_CLOSE(callable); PyStackRef_CLOSE(callable);
PyStackRef_CLOSE(self_or_null[0]); PyStackRef_CLOSE(self_or_null[0]);
@ -4713,7 +4713,7 @@
PyCFunctionFast cfunc = PyCFunctionFast cfunc =
(PyCFunctionFast)(void(*)(void))meth->ml_meth; (PyCFunctionFast)(void(*)(void))meth->ml_meth;
int nargs = total_args - 1; int nargs = total_args - 1;
STACKREFS_TO_PYOBJECTS(args, nargs, args_o); STACKREFS_TO_PYOBJECTS(args, total_args, args_o);
if (CONVERSION_FAILED(args_o)) { if (CONVERSION_FAILED(args_o)) {
PyStackRef_CLOSE(callable); PyStackRef_CLOSE(callable);
PyStackRef_CLOSE(self_or_null[0]); PyStackRef_CLOSE(self_or_null[0]);

4
Python/generated_cases.c.h generated
View File

@ -2252,7 +2252,7 @@
PyCFunctionFast cfunc = PyCFunctionFast cfunc =
(PyCFunctionFast)(void(*)(void))meth->ml_meth; (PyCFunctionFast)(void(*)(void))meth->ml_meth;
int nargs = total_args - 1; int nargs = total_args - 1;
STACKREFS_TO_PYOBJECTS(args, nargs, args_o); STACKREFS_TO_PYOBJECTS(args, total_args, args_o);
if (CONVERSION_FAILED(args_o)) { if (CONVERSION_FAILED(args_o)) {
PyStackRef_CLOSE(callable); PyStackRef_CLOSE(callable);
PyStackRef_CLOSE(self_or_null[0]); PyStackRef_CLOSE(self_or_null[0]);
@ -2333,7 +2333,7 @@
int nargs = total_args - 1; int nargs = total_args - 1;
PyCFunctionFastWithKeywords cfunc = PyCFunctionFastWithKeywords cfunc =
(PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth; (PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
STACKREFS_TO_PYOBJECTS(args, nargs, args_o); STACKREFS_TO_PYOBJECTS(args, total_args, args_o);
if (CONVERSION_FAILED(args_o)) { if (CONVERSION_FAILED(args_o)) {
PyStackRef_CLOSE(callable); PyStackRef_CLOSE(callable);
PyStackRef_CLOSE(self_or_null[0]); PyStackRef_CLOSE(self_or_null[0]);