Skip to content

bpo-43693: Add _PyCode_New(). #26375

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
ericsnowcurrently merged 8 commits into from
May 27, 2021
Merged

bpo-43693: Add _PyCode_New(). #26375

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
974cb91
Add _PyCode_New().
ericsnowcurrently May 25, 2021
e4387e4
Check nplainlocals instead of totalargs.
ericsnowcurrently May 26, 2021
7e3a247
Add _PyCode_Validate().
ericsnowcurrently May 25, 2021
c310d7c
Drop nlocals from marshaled code objects.
ericsnowcurrently May 25, 2021
fa5d83e
Fix test_ctypes.
ericsnowcurrently May 26, 2021
e356588
Stop using statics in PyCode_NewEmpty().
ericsnowcurrently May 20, 2021
f2b227a
Drop "inline" from a big function.
ericsnowcurrently May 27, 2021
b36ca68
Fail if there was an error.
ericsnowcurrently May 27, 2021
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
Check nplainlocals instead of totalargs.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 26, 2021
commit e4387e416d35a97b8257ea629eea5f362b96cb18
17 changes: 8 additions & 9 deletions Objects/codeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,15 +332,14 @@ PyCode_NewWithPosOnlyArgs(int argcount, int posonlyargcount, int kwonlyargcount,
return NULL;
}

if (argcount > nlocals || kwonlyargcount > nlocals) {
PyErr_SetString(PyExc_ValueError, "code: varnames is too small");
return NULL;
}
int totalargs = argcount +
kwonlyargcount +
((flags & CO_VARARGS) != 0) +
((flags & CO_VARKEYWORDS) != 0);
if (totalargs > nlocals) {
// Note that totalargs = nlocals - nplainlocals. We check nplainlocals
// here to avoid the possibility of overflow (however remote).
int nplainlocals = nlocals -
argcount -
kwonlyargcount -
((flags & CO_VARARGS) != 0) -
((flags & CO_VARKEYWORDS) != 0);
if (nplainlocals < 0) {
PyErr_SetString(PyExc_ValueError, "code: varnames is too small");
return NULL;
}
Expand Down