diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:40 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:40 -0800 |
| commit | b2fa705fd3887c326e811c418469c784353027f4 (patch) | |
| tree | b3428f73de91453edbfd4df1a5d4a212d182eb44 /Modules/resource.c | |
| parent | 134e58fd3aaa2e91390041e143f3f0a21a60142b (diff) | |
| parent | b53654b6dbfce8318a7d4d1cdaddca7a7fec194b (diff) | |
| download | cpython-b2fa705fd3887c326e811c418469c784353027f4.tar.gz | |
Issue #29392: Prevent crash when passing invalid arguments into msvcrt module.
Diffstat (limited to 'Modules/resource.c')
| -rw-r--r-- | Modules/resource.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Modules/resource.c b/Modules/resource.c index 970ee84f8e..113ad5c3d0 100644 --- a/Modules/resource.c +++ b/Modules/resource.c @@ -152,13 +152,11 @@ error: static PyObject* rlimit2py(struct rlimit rl) { -#if defined(HAVE_LONG_LONG) if (sizeof(rl.rlim_cur) > sizeof(long)) { return Py_BuildValue("LL", - (PY_LONG_LONG) rl.rlim_cur, - (PY_LONG_LONG) rl.rlim_max); + (long long) rl.rlim_cur, + (long long) rl.rlim_max); } -#endif return Py_BuildValue("ll", (long) rl.rlim_cur, (long) rl.rlim_max); } @@ -436,11 +434,9 @@ PyInit_resource(void) PyModule_AddIntMacro(m, RLIMIT_NPTS); #endif -#if defined(HAVE_LONG_LONG) if (sizeof(RLIM_INFINITY) > sizeof(long)) { - v = PyLong_FromLongLong((PY_LONG_LONG) RLIM_INFINITY); + v = PyLong_FromLongLong((long long) RLIM_INFINITY); } else -#endif { v = PyLong_FromLong((long) RLIM_INFINITY); } |