Make Py_BuildValue, PyObject_CallFunction and
PyObject_CallMethod aware of PY_SSIZE_T_CLEAN.
diff --git a/Python/exceptions.c b/Python/exceptions.c
index e5f8f05..5c824e6 100644
--- a/Python/exceptions.c
+++ b/Python/exceptions.c
@@ -14,6 +14,7 @@
* Copyright (c) 1998-2000 by Secret Labs AB. All rights reserved.
*/
+#define PY_SSIZE_T_CLEAN
#include "Python.h"
#include "osdefs.h"
@@ -1450,8 +1451,8 @@
assert(length < INT_MAX);
assert(start < INT_MAX);
assert(end < INT_MAX);
- return PyObject_CallFunction(PyExc_UnicodeDecodeError, "ss#iis",
- encoding, object, (int)length, (int)start, (int)end, reason);
+ return PyObject_CallFunction(PyExc_UnicodeDecodeError, "ss#nns",
+ encoding, object, length, start, end, reason);
}
@@ -1565,7 +1566,7 @@
const Py_UNICODE *object, Py_ssize_t length,
Py_ssize_t start, Py_ssize_t end, const char *reason)
{
- return PyObject_CallFunction(PyExc_UnicodeTranslateError, "u#iis",
+ return PyObject_CallFunction(PyExc_UnicodeTranslateError, "u#nns",
object, length, start, end, reason);
}
#endif
diff --git a/Python/getargs.c b/Python/getargs.c
index 5908e6b..f5e2154 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -18,6 +18,18 @@
int PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *,
const char *, char **, va_list);
+#ifdef HAVE_DECLSPEC_DLL
+/* Export functions */
+PyAPI_FUNC(int) _PyArg_Parse_SizeT(PyObject *, char *, ...);
+PyAPI_FUNC(int) _PyArg_ParseTuple_SizeT(PyObject *, char *, ...);
+PyAPI_FUNC(int) _PyArg_ParseTupleAndKeywords_SizeT(PyObject *, PyObject *,
+ const char *, char **, ...);
+PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...);
+PyAPI_FUNC(int) _PyArg_VaParse_SizeT(PyObject *, char *, va_list);
+PyAPI_FUNC(int) _PyArg_VaParseTupleAndKeywords_SizeT(PyObject *, PyObject *,
+ const char *, char **, va_list);
+#endif
+
#define FLAG_COMPAT 1
#define FLAG_SIZE_T 2
diff --git a/Python/modsupport.c b/Python/modsupport.c
index 65480c8..dd7454c 100644
--- a/Python/modsupport.c
+++ b/Python/modsupport.c
@@ -3,8 +3,14 @@
#include "Python.h"
+#define FLAG_SIZE_T 1
typedef double va_double;
+static PyObject *va_build_value(const char *, va_list, int);
+#ifdef HAVE_DECLSPEC_DLL
+PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...);
+#endif
+
/* Package context -- the full module name for package imports */
char *_Py_PackageContext = NULL;
@@ -146,14 +152,14 @@
/* Generic function to create a value -- the inverse of getargs() */
/* After an original idea and first implementation by Steven Miale */
-static PyObject *do_mktuple(const char**, va_list *, int, int);
-static PyObject *do_mklist(const char**, va_list *, int, int);
-static PyObject *do_mkdict(const char**, va_list *, int, int);
-static PyObject *do_mkvalue(const char**, va_list *);
+static PyObject *do_mktuple(const char**, va_list *, int, int, int);
+static PyObject *do_mklist(const char**, va_list *, int, int, int);
+static PyObject *do_mkdict(const char**, va_list *, int, int, int);
+static PyObject *do_mkvalue(const char**, va_list *, int);
static PyObject *
-do_mkdict(const char **p_format, va_list *p_va, int endchar, int n)
+do_mkdict(const char **p_format, va_list *p_va, int endchar, int n, int flags)
{
PyObject *d;
int i;
@@ -167,13 +173,13 @@
for (i = 0; i < n; i+= 2) {
PyObject *k, *v;
int err;
- k = do_mkvalue(p_format, p_va);
+ k = do_mkvalue(p_format, p_va, flags);
if (k == NULL) {
itemfailed = 1;
Py_INCREF(Py_None);
k = Py_None;
}
- v = do_mkvalue(p_format, p_va);
+ v = do_mkvalue(p_format, p_va, flags);
if (v == NULL) {
itemfailed = 1;
Py_INCREF(Py_None);
@@ -199,7 +205,7 @@
}
static PyObject *
-do_mklist(const char **p_format, va_list *p_va, int endchar, int n)
+do_mklist(const char **p_format, va_list *p_va, int endchar, int n, int flags)
{
PyObject *v;
int i;
@@ -212,7 +218,7 @@
/* Note that we can't bail immediately on error as this will leak
refcounts on any 'N' arguments. */
for (i = 0; i < n; i++) {
- PyObject *w = do_mkvalue(p_format, p_va);
+ PyObject *w = do_mkvalue(p_format, p_va, flags);
if (w == NULL) {
itemfailed = 1;
Py_INCREF(Py_None);
@@ -249,7 +255,7 @@
#endif
static PyObject *
-do_mktuple(const char **p_format, va_list *p_va, int endchar, int n)
+do_mktuple(const char **p_format, va_list *p_va, int endchar, int n, int flags)
{
PyObject *v;
int i;
@@ -261,7 +267,7 @@
/* Note that we can't bail immediately on error as this will leak
refcounts on any 'N' arguments. */
for (i = 0; i < n; i++) {
- PyObject *w = do_mkvalue(p_format, p_va);
+ PyObject *w = do_mkvalue(p_format, p_va, flags);
if (w == NULL) {
itemfailed = 1;
Py_INCREF(Py_None);
@@ -286,21 +292,21 @@
}
static PyObject *
-do_mkvalue(const char **p_format, va_list *p_va)
+do_mkvalue(const char **p_format, va_list *p_va, int flags)
{
for (;;) {
switch (*(*p_format)++) {
case '(':
return do_mktuple(p_format, p_va, ')',
- countformat(*p_format, ')'));
+ countformat(*p_format, ')'), flags);
case '[':
return do_mklist(p_format, p_va, ']',
- countformat(*p_format, ']'));
+ countformat(*p_format, ']'), flags);
case '{':
return do_mkdict(p_format, p_va, '}',
- countformat(*p_format, '}'));
+ countformat(*p_format, '}'), flags);
case 'b':
case 'B':
@@ -351,10 +357,13 @@
{
PyObject *v;
Py_UNICODE *u = va_arg(*p_va, Py_UNICODE *);
- int n;
+ Py_ssize_t n;
if (**p_format == '#') {
++*p_format;
- n = va_arg(*p_va, int);
+ if (flags & FLAG_SIZE_T)
+ n = va_arg(*p_va, Py_ssize_t);
+ else
+ n = va_arg(*p_va, int);
}
else
n = -1;
@@ -393,10 +402,13 @@
{
PyObject *v;
char *str = va_arg(*p_va, char *);
- int n;
+ Py_ssize_t n;
if (**p_format == '#') {
++*p_format;
- n = va_arg(*p_va, int);
+ if (flags & FLAG_SIZE_T)
+ n = va_arg(*p_va, Py_ssize_t);
+ else
+ n = va_arg(*p_va, int);
}
else
n = -1;
@@ -472,7 +484,18 @@
va_list va;
PyObject* retval;
va_start(va, format);
- retval = Py_VaBuildValue(format, va);
+ retval = va_build_value(format, va, 0);
+ va_end(va);
+ return retval;
+}
+
+PyObject *
+_Py_BuildValue_SizeT(const char *format, ...)
+{
+ va_list va;
+ PyObject* retval;
+ va_start(va, format);
+ retval = va_build_value(format, va, FLAG_SIZE_T);
va_end(va);
return retval;
}
@@ -480,6 +503,18 @@
PyObject *
Py_VaBuildValue(const char *format, va_list va)
{
+ return va_build_value(format, va, 0);
+}
+
+PyObject *
+_Py_VaBuildValue_SizeT(const char *format, va_list va)
+{
+ return va_build_value(format, va, FLAG_SIZE_T);
+}
+
+static PyObject *
+va_build_value(const char *format, va_list va, int flags)
+{
const char *f = format;
int n = countformat(f, '\0');
va_list lva;
@@ -501,8 +536,8 @@
return Py_None;
}
if (n == 1)
- return do_mkvalue(&f, &lva);
- return do_mktuple(&f, &lva, '\0', n);
+ return do_mkvalue(&f, &lva, flags);
+ return do_mktuple(&f, &lva, '\0', n, flags);
}