Skip to content

gh-83004: Harden msvcrt further #103420

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 8 commits into from
Apr 19, 2023
Merged

gh-83004: Harden msvcrt further #103420

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
88bb327
gh-83004: Harden msvcrt further
erlend-aasland Apr 10, 2023
6c1f145
Make the diff slightly nicer
erlend-aasland Apr 10, 2023
93df440
Merge branch 'main' into harden-msvcrt-even-more
erlend-aasland Apr 12, 2023
1dcfc4f
Pull in main
erlend-aasland Apr 12, 2023
9ff5c3f
Update PC/msvcrtmodule.c
kumaraditya303 Apr 18, 2023
64efb42
Pull in main
erlend-aasland Apr 18, 2023
b058d09
Intermingled declaration
erlend-aasland Apr 18, 2023
1f2162b
Adress review: Return -1 iso. goto error
erlend-aasland Apr 18, 2023
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
Pull in main
  • Loading branch information
@erlend-aasland
erlend-aasland committed Apr 12, 2023
commit 1dcfc4f8a5b9a1fda8df7b78d172a21c848314f3
22 changes: 3 additions & 19 deletions PC/msvcrtmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,19 +564,6 @@ static struct PyMethodDef msvcrt_functions[] = {
{NULL, NULL}
};


static struct PyModuleDef msvcrtmodule = {
PyModuleDef_HEAD_INIT,
"msvcrt",
NULL,
-1,
msvcrt_functions,
NULL,
NULL,
NULL,
NULL
};

static int
insertptr(PyObject *mod, char *name, void *value)
{
Expand Down Expand Up @@ -607,13 +594,10 @@ insertptr(PyObject *mod, char *name, void *value)
} \
} while (0)

PyMODINIT_FUNC
PyInit_msvcrt(void)
static int
exec_module(PyObject* m)
{
PyObject *m = PyModule_Create(&msvcrtmodule);
if (m == NULL) {
return NULL;
}
int st;

/* constants for the locking() function's mode argument */
INSERTINT(m, "LK_LOCK", _LK_LOCK);
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.