summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
Diffstat (limited to 'Python')
-rw-r--r--Python/marshal.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/Python/marshal.c b/Python/marshal.c
index 7b583eef1a..e23daf6497 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -39,6 +39,9 @@ module marshal
#define TYPE_STOPITER 'S'
#define TYPE_ELLIPSIS '.'
#define TYPE_INT 'i'
+/* TYPE_INT64 is not generated anymore.
+ Supported for backward compatibility only. */
+#define TYPE_INT64 'I'
#define TYPE_FLOAT 'f'
#define TYPE_BINARY_FLOAT 'g'
#define TYPE_COMPLEX 'x'
@@ -783,6 +786,19 @@ r_long(RFILE *p)
return x;
}
+/* r_long64 deals with the TYPE_INT64 code. */
+static PyObject *
+r_long64(RFILE *p)
+{
+ const unsigned char *buffer = (const unsigned char *) r_string(8, p);
+ if (buffer == NULL) {
+ return NULL;
+ }
+ return _PyLong_FromByteArray(buffer, 8,
+ 1 /* little endian */,
+ 1 /* signed */);
+}
+
static PyObject *
r_PyLong(RFILE *p)
{
@@ -982,6 +998,11 @@ r_object(RFILE *p)
R_REF(retval);
break;
+ case TYPE_INT64:
+ retval = r_long64(p);
+ R_REF(retval);
+ break;
+
case TYPE_LONG:
retval = r_PyLong(p);
R_REF(retval);