mirror of
https://github.com/python/cpython
synced 2024-09-15 23:46:26 +00:00
gh-117021: Fix integer overflow in PyLong_AsPid() on non-Windows 64-bit platforms (GH-117064)
This commit is contained in:
parent
8182319de3
commit
519b2ae22b
|
@ -63,6 +63,7 @@
|
||||||
#include "bytearrayobject.h"
|
#include "bytearrayobject.h"
|
||||||
#include "bytesobject.h"
|
#include "bytesobject.h"
|
||||||
#include "unicodeobject.h"
|
#include "unicodeobject.h"
|
||||||
|
#include "pyerrors.h"
|
||||||
#include "longobject.h"
|
#include "longobject.h"
|
||||||
#include "cpython/longintrepr.h"
|
#include "cpython/longintrepr.h"
|
||||||
#include "boolobject.h"
|
#include "boolobject.h"
|
||||||
|
@ -99,7 +100,6 @@
|
||||||
#include "cpython/picklebufobject.h"
|
#include "cpython/picklebufobject.h"
|
||||||
#include "cpython/pytime.h"
|
#include "cpython/pytime.h"
|
||||||
#include "codecs.h"
|
#include "codecs.h"
|
||||||
#include "pyerrors.h"
|
|
||||||
#include "pythread.h"
|
#include "pythread.h"
|
||||||
#include "cpython/context.h"
|
#include "cpython/context.h"
|
||||||
#include "modsupport.h"
|
#include "modsupport.h"
|
||||||
|
|
|
@ -40,7 +40,24 @@ PyAPI_FUNC(PyObject *) PyLong_GetInfo(void);
|
||||||
#if !defined(SIZEOF_PID_T) || SIZEOF_PID_T == SIZEOF_INT
|
#if !defined(SIZEOF_PID_T) || SIZEOF_PID_T == SIZEOF_INT
|
||||||
#define _Py_PARSE_PID "i"
|
#define _Py_PARSE_PID "i"
|
||||||
#define PyLong_FromPid PyLong_FromLong
|
#define PyLong_FromPid PyLong_FromLong
|
||||||
#define PyLong_AsPid PyLong_AsLong
|
# if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030d0000
|
||||||
|
# define PyLong_AsPid PyLong_AsInt
|
||||||
|
# elif SIZEOF_INT == SIZEOF_LONG
|
||||||
|
# define PyLong_AsPid PyLong_AsLong
|
||||||
|
# else
|
||||||
|
static inline int
|
||||||
|
PyLong_AsPid(PyObject *obj)
|
||||||
|
{
|
||||||
|
int overflow;
|
||||||
|
long result = PyLong_AsLongAndOverflow(obj, &overflow);
|
||||||
|
if (overflow || result > INT_MAX || result < INT_MIN) {
|
||||||
|
PyErr_SetString(PyExc_OverflowError,
|
||||||
|
"Python int too large to convert to C int");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
return (int)result;
|
||||||
|
}
|
||||||
|
# endif
|
||||||
#elif SIZEOF_PID_T == SIZEOF_LONG
|
#elif SIZEOF_PID_T == SIZEOF_LONG
|
||||||
#define _Py_PARSE_PID "l"
|
#define _Py_PARSE_PID "l"
|
||||||
#define PyLong_FromPid PyLong_FromLong
|
#define PyLong_FromPid PyLong_FromLong
|
||||||
|
|
|
@ -425,6 +425,34 @@ def test_long_asvoidptr(self):
|
||||||
self.assertRaises(OverflowError, asvoidptr, -2**1000)
|
self.assertRaises(OverflowError, asvoidptr, -2**1000)
|
||||||
# CRASHES asvoidptr(NULL)
|
# CRASHES asvoidptr(NULL)
|
||||||
|
|
||||||
|
def _test_long_aspid(self, aspid):
|
||||||
|
# Test PyLong_AsPid()
|
||||||
|
from _testcapi import SIZEOF_PID_T
|
||||||
|
bits = 8 * SIZEOF_PID_T
|
||||||
|
PID_T_MIN = -2**(bits-1)
|
||||||
|
PID_T_MAX = 2**(bits-1) - 1
|
||||||
|
# round trip (object -> long -> object)
|
||||||
|
for value in (PID_T_MIN, PID_T_MAX, -1, 0, 1, 1234):
|
||||||
|
with self.subTest(value=value):
|
||||||
|
self.assertEqual(aspid(value), value)
|
||||||
|
|
||||||
|
self.assertEqual(aspid(IntSubclass(42)), 42)
|
||||||
|
self.assertEqual(aspid(Index(42)), 42)
|
||||||
|
self.assertEqual(aspid(MyIndexAndInt()), 10)
|
||||||
|
|
||||||
|
self.assertRaises(OverflowError, aspid, PID_T_MIN - 1)
|
||||||
|
self.assertRaises(OverflowError, aspid, PID_T_MAX + 1)
|
||||||
|
self.assertRaises(TypeError, aspid, 1.0)
|
||||||
|
self.assertRaises(TypeError, aspid, b'2')
|
||||||
|
self.assertRaises(TypeError, aspid, '3')
|
||||||
|
self.assertRaises(SystemError, aspid, NULL)
|
||||||
|
|
||||||
|
def test_long_aspid(self):
|
||||||
|
self._test_long_aspid(_testcapi.pylong_aspid)
|
||||||
|
|
||||||
|
def test_long_aspid_limited(self):
|
||||||
|
self._test_long_aspid(_testlimitedcapi.pylong_aspid)
|
||||||
|
|
||||||
def test_long_asnativebytes(self):
|
def test_long_asnativebytes(self):
|
||||||
import math
|
import math
|
||||||
from _testcapi import (
|
from _testcapi import (
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
Fix integer overflow in :c:func:`PyLong_AsPid` on non-Windows 64-bit
|
||||||
|
platforms.
|
|
@ -92,12 +92,24 @@ pylong_fromnativebytes(PyObject *module, PyObject *args)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
pylong_aspid(PyObject *module, PyObject *arg)
|
||||||
|
{
|
||||||
|
NULLABLE(arg);
|
||||||
|
pid_t value = PyLong_AsPid(arg);
|
||||||
|
if (value == -1 && PyErr_Occurred()) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
return PyLong_FromPid(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static PyMethodDef test_methods[] = {
|
static PyMethodDef test_methods[] = {
|
||||||
_TESTCAPI_CALL_LONG_COMPACT_API_METHODDEF
|
_TESTCAPI_CALL_LONG_COMPACT_API_METHODDEF
|
||||||
{"pylong_fromunicodeobject", pylong_fromunicodeobject, METH_VARARGS},
|
{"pylong_fromunicodeobject", pylong_fromunicodeobject, METH_VARARGS},
|
||||||
{"pylong_asnativebytes", pylong_asnativebytes, METH_VARARGS},
|
{"pylong_asnativebytes", pylong_asnativebytes, METH_VARARGS},
|
||||||
{"pylong_fromnativebytes", pylong_fromnativebytes, METH_VARARGS},
|
{"pylong_fromnativebytes", pylong_fromnativebytes, METH_VARARGS},
|
||||||
|
{"pylong_aspid", pylong_aspid, METH_O},
|
||||||
{NULL},
|
{NULL},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -3975,6 +3975,7 @@ PyInit__testcapi(void)
|
||||||
PyModule_AddObject(m, "SIZEOF_WCHAR_T", PyLong_FromSsize_t(sizeof(wchar_t)));
|
PyModule_AddObject(m, "SIZEOF_WCHAR_T", PyLong_FromSsize_t(sizeof(wchar_t)));
|
||||||
PyModule_AddObject(m, "SIZEOF_VOID_P", PyLong_FromSsize_t(sizeof(void*)));
|
PyModule_AddObject(m, "SIZEOF_VOID_P", PyLong_FromSsize_t(sizeof(void*)));
|
||||||
PyModule_AddObject(m, "SIZEOF_TIME_T", PyLong_FromSsize_t(sizeof(time_t)));
|
PyModule_AddObject(m, "SIZEOF_TIME_T", PyLong_FromSsize_t(sizeof(time_t)));
|
||||||
|
PyModule_AddObject(m, "SIZEOF_PID_T", PyLong_FromSsize_t(sizeof(pid_t)));
|
||||||
PyModule_AddObject(m, "Py_Version", PyLong_FromUnsignedLong(Py_Version));
|
PyModule_AddObject(m, "Py_Version", PyLong_FromUnsignedLong(Py_Version));
|
||||||
Py_INCREF(&PyInstanceMethod_Type);
|
Py_INCREF(&PyInstanceMethod_Type);
|
||||||
PyModule_AddObject(m, "instancemethod", (PyObject *)&PyInstanceMethod_Type);
|
PyModule_AddObject(m, "instancemethod", (PyObject *)&PyInstanceMethod_Type);
|
||||||
|
|
|
@ -746,6 +746,17 @@ pylong_asvoidptr(PyObject *module, PyObject *arg)
|
||||||
return Py_NewRef((PyObject *)value);
|
return Py_NewRef((PyObject *)value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
pylong_aspid(PyObject *module, PyObject *arg)
|
||||||
|
{
|
||||||
|
NULLABLE(arg);
|
||||||
|
pid_t value = PyLong_AsPid(arg);
|
||||||
|
if (value == -1 && PyErr_Occurred()) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
return PyLong_FromPid(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static PyMethodDef test_methods[] = {
|
static PyMethodDef test_methods[] = {
|
||||||
_TESTLIMITEDCAPI_TEST_LONG_AND_OVERFLOW_METHODDEF
|
_TESTLIMITEDCAPI_TEST_LONG_AND_OVERFLOW_METHODDEF
|
||||||
|
@ -773,6 +784,7 @@ static PyMethodDef test_methods[] = {
|
||||||
{"pylong_as_size_t", pylong_as_size_t, METH_O},
|
{"pylong_as_size_t", pylong_as_size_t, METH_O},
|
||||||
{"pylong_asdouble", pylong_asdouble, METH_O},
|
{"pylong_asdouble", pylong_asdouble, METH_O},
|
||||||
{"pylong_asvoidptr", pylong_asvoidptr, METH_O},
|
{"pylong_asvoidptr", pylong_asvoidptr, METH_O},
|
||||||
|
{"pylong_aspid", pylong_aspid, METH_O},
|
||||||
{NULL},
|
{NULL},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue