mirror of https://github.com/python/cpython
Try to fix the problem of passing a non-int on Win64 right this time.
This commit is contained in:
parent
1fe5f38852
commit
b879f57b32
|
@ -665,11 +665,14 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
|
|||
case 'n': /* Py_ssize_t */
|
||||
#if SIZEOF_SIZE_T != SIZEOF_LONG
|
||||
{
|
||||
PyObject *iobj;
|
||||
Py_ssize_t *p = va_arg(*p_va, Py_ssize_t *);
|
||||
Py_ssize_t ival;
|
||||
Py_ssize_t ival = -1;
|
||||
if (float_argument_error(arg))
|
||||
return converterr("integer<n>", arg, msgbuf, bufsize);
|
||||
ival = PyNumber_AsSsize_t(arg);
|
||||
iobj = PyNumber_Index(arg);
|
||||
if (iobj != NULL)
|
||||
ival = PyNumber_AsSsize_t(arg);
|
||||
if (ival == -1 && PyErr_Occurred())
|
||||
return converterr("integer<n>", arg, msgbuf, bufsize);
|
||||
*p = ival;
|
||||
|
|
Loading…
Reference in New Issue