https://github.com/python/cpython/commit/34a0e7a8243ce708ae8c61ab213f38e8f882d4dc
commit: 34a0e7a8243ce708ae8c61ab213f38e8f882d4dc
branch: 3.12
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2024-06-01T17:08:07+02:00
summary:
[3.12] Revert "[3.12] gh-69214: Fix fcntl.ioctl() request type (#119498) (#1…
(#119905)
Revert "[3.12] gh-69214: Fix fcntl.ioctl() request type (#119498) (#119505)"
This reverts commit 078da88ad19e8f7474b6943edd39b7e61511bd20.
The change modified how negative values, like termios.TIOCSWINSZ, was
treated and is actually backward incompatible.
files:
D Misc/NEWS.d/next/Library/2024-05-24-11-47-08.gh-issue-69214.Grl6zF.rst
M Modules/clinic/fcntlmodule.c.h
M Modules/fcntlmodule.c
diff --git
a/Misc/NEWS.d/next/Library/2024-05-24-11-47-08.gh-issue-69214.Grl6zF.rst
b/Misc/NEWS.d/next/Library/2024-05-24-11-47-08.gh-issue-69214.Grl6zF.rst
deleted file mode 100644
index 8c3a36c9f56475..00000000000000
--- a/Misc/NEWS.d/next/Library/2024-05-24-11-47-08.gh-issue-69214.Grl6zF.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix ``fcntl.ioctl()`` *request* parameter: use an ``unsigned long`` instead of
-an ``unsigned int`` for the *request* parameter of :func:`fcntl.ioctl` to
-support requests larger than ``UINT_MAX``. Patch by Victor Stinner.
diff --git a/Modules/clinic/fcntlmodule.c.h b/Modules/clinic/fcntlmodule.c.h
index 7de07fe1afa988..20eb50b0e76b38 100644
--- a/Modules/clinic/fcntlmodule.c.h
+++ b/Modules/clinic/fcntlmodule.c.h
@@ -96,7 +96,7 @@ PyDoc_STRVAR(fcntl_ioctl__doc__,
{"ioctl", _PyCFunction_CAST(fcntl_ioctl), METH_FASTCALL,
fcntl_ioctl__doc__},
static PyObject *
-fcntl_ioctl_impl(PyObject *module, int fd, unsigned long code,
+fcntl_ioctl_impl(PyObject *module, int fd, unsigned int code,
PyObject *ob_arg, int mutate_arg);
static PyObject *
@@ -104,7 +104,7 @@ fcntl_ioctl(PyObject *module, PyObject *const *args,
Py_ssize_t nargs)
{
PyObject *return_value = NULL;
int fd;
- unsigned long code;
+ unsigned int code;
PyObject *ob_arg = NULL;
int mutate_arg = 1;
@@ -114,11 +114,10 @@ fcntl_ioctl(PyObject *module, PyObject *const *args,
Py_ssize_t nargs)
if (!_PyLong_FileDescriptor_Converter(args[0], &fd)) {
goto exit;
}
- if (!PyLong_Check(args[1])) {
- _PyArg_BadArgument("ioctl", "argument 2", "int", args[1]);
+ code = (unsigned int)PyLong_AsUnsignedLongMask(args[1]);
+ if (code == (unsigned int)-1 && PyErr_Occurred()) {
goto exit;
}
- code = PyLong_AsUnsignedLongMask(args[1]);
if (nargs < 3) {
goto skip_optional;
}
@@ -250,4 +249,4 @@ fcntl_lockf(PyObject *module, PyObject *const *args,
Py_ssize_t nargs)
exit:
return return_value;
}
-/*[clinic end generated code: output=4362fb678c9c5447 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=1db859412172dd53 input=a9049054013a1b77]*/
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
index a1b8b974feaa75..2bca40213c65b9 100644
--- a/Modules/fcntlmodule.c
+++ b/Modules/fcntlmodule.c
@@ -108,7 +108,7 @@ fcntl_fcntl_impl(PyObject *module, int fd, int code,
PyObject *arg)
fcntl.ioctl
fd: fildes
- request as code: unsigned_long(bitwise=True)
+ request as code: unsigned_int(bitwise=True)
arg as ob_arg: object(c_default='NULL') = 0
mutate_flag as mutate_arg: bool = True
/
@@ -144,9 +144,9 @@ code.
[clinic start generated code]*/
static PyObject *
-fcntl_ioctl_impl(PyObject *module, int fd, unsigned long code,
+fcntl_ioctl_impl(PyObject *module, int fd, unsigned int code,
PyObject *ob_arg, int mutate_arg)
-/*[clinic end generated code: output=3d8eb6828666cea1 input=cee70f6a27311e58]*/
+/*[clinic end generated code: output=7f7f5840c65991be input=967b4a4cbeceb0a8]*/
{
#define IOCTL_BUFSZ 1024
/* We use the unsigned non-checked 'I' format for the 'code' parameter
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
