Skip to content

gh-94512: Fix forced arg format in AC-processed resource #94515

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
merged 6 commits into from
Jul 29, 2022
Merged

gh-94512: Fix forced arg format in AC-processed resource #94515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7792291
Fix forced arg format in AC-processed resource
arhadthedev Jul 2, 2022
c10054d
Add a NEWS entry
arhadthedev Jul 3, 2022
7c5907a
Actualize a NEWS entry
arhadthedev Jul 4, 2022
c0a4f84
Fix an optionality check (we need to compare with Py_None, not NULL)
arhadthedev Jul 4, 2022
95b8316
Merge branch 'main' into clinic-resource-deformat
arhadthedev Jul 24, 2022
d349c5c
Delete 2022-07-03-23-09-45.gh-issue-94512.9wtOYT.rst
arhadthedev Jul 29, 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
49 changes: 25 additions & 24 deletions Modules/clinic/resource.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 13 additions & 7 deletions Modules/resource.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,16 @@ module resource
class pid_t_converter(CConverter):
type = 'pid_t'
format_unit = '" _Py_PARSE_PID "'

def parse_arg(self, argname, displayname):
return """
{paramname} = PyLong_AsPid({argname});
if ({paramname} == -1 && PyErr_Occurred()) {{{{
goto exit;
}}}}
""".format(argname=argname, paramname=self.parser_name)
[python start generated code]*/
/*[python end generated code: output=da39a3ee5e6b4b0d input=0c1d19f640d57e48]*/
/*[python end generated code: output=da39a3ee5e6b4b0d input=5af1c116d56cbb5a]*/

#include "clinic/resource.c.h"

Expand Down Expand Up @@ -268,17 +276,15 @@ resource.prlimit

pid: pid_t
resource: int
[
limits: object
]
limits: object = None
/

[clinic start generated code]*/

static PyObject *
resource_prlimit_impl(PyObject *module, pid_t pid, int resource,
int group_right_1, PyObject *limits)
/*[clinic end generated code: output=ee976b393187a7a3 input=b77743bdccc83564]*/
PyObject *limits)
/*[clinic end generated code: output=6ebc49ff8c3a816e input=54bb69c9585e33bf]*/
{
struct rlimit old_limit, new_limit;
int retval;
Expand All @@ -294,7 +300,7 @@ resource_prlimit_impl(PyObject *module, pid_t pid, int resource,
return NULL;
}

if (group_right_1) {
if (limits != Py_None) {
if (py2rlimit(limits, &new_limit) < 0) {
return NULL;
}
Expand Down